wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity
328,534 Commits 5 Branches 0 Tags
2b2a27ed4452e5b6dbdd0036fa521663111c671d
Commit Graph

3184 Commits

Author SHA1 Message Date
Julien Nabet
14ed0d1629 cppcheck: fix redundant assignments 
Change-Id: I3fb495c6e18b3cb5e9d4beca4212d4aa8097401e
 2013-06-13 20:36:56 +02:00
Stephan Bergmann
3af0114a29 Introduce O[U]String::toUInt32 
...which has become necessary since bd60d41176da540b01d7583cfe00637431967f39
"Handle oveflow in O(U)String::toInt() functions" reduces values in the range
(SAL_MAX_INT32 .. SAL_MAX_UINT32] to zero, but some calls of toInt32(16) relied
on getting a correct (unsigned) value for the whole input range ["0" ..
"FFFFFFFF"] (see libreoffice-4-1 commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3
"Revert overflow checks in O[U]String::toInt{32,64} again").

Audited all uses of toInt32/64 with non-decimal radix.  (There is still a TODO
comment in oox/source/helper/attributelist.cxx, and
stoc/source/typeconv/convert.cxx will still need some love and test code.)

Change-Id: Iadaca1c0e41dab553687d0ce41c20c10cd657a95
 2013-06-13 17:08:36 +02:00
Armin Le Grand
e0cce521f1 Resolves: #i121504# Support for alpha channel in clipboard for all systems 
(cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519)

Conflicts:
	automation/source/server/statemnt.cxx
	basic/source/runtime/methods.cxx
	canvas/source/vcl/devicehelper.cxx
	canvas/source/vcl/spritedevicehelper.cxx
	drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	drawinglayer/source/tools/converters.cxx
	dtrans/source/win32/dtobj/FmtFilter.cxx
	editeng/source/items/bulitem.cxx
	extensions/source/scanner/sanedlg.cxx
	external/gcc3_specific/makefile.mk
	filter/source/graphicfilter/eos2met/eos2met.cxx
	filter/source/graphicfilter/ios2met/ios2met.cxx
	filter/source/msfilter/msdffimp.cxx
	fpicker/source/office/iodlg.cxx
	framework/source/fwe/classes/addonsoptions.cxx
	framework/source/fwe/helper/actiontriggerhelper.cxx
	sc/source/filter/excel/xiescher.cxx
	sc/source/ui/docshell/docsh.cxx
	sc/source/ui/inc/viewfunc.hxx
	sd/source/ui/app/sdxfer.cxx
	sd/source/ui/unoidl/unopage.cxx
	sd/source/ui/view/sdview3.cxx
	sfx2/source/appl/fileobj.cxx
	sfx2/source/appl/linkmgr2.cxx
	sfx2/source/dialog/filedlghelper.cxx
	sfx2/source/dialog/intro.cxx
	sfx2/source/doc/docinf.cxx
	sot/inc/sot/formats.hxx
	sot/source/base/formats.cxx
	svtools/bmpmaker/bmpcore.cxx
	svtools/bmpmaker/bmpsum.cxx
	svtools/inc/svtools/transfer.hxx
	svtools/source/filter/filter.cxx
	svtools/source/filter/wmf/emfwr.cxx
	svtools/source/filter/wmf/enhwmf.cxx
	svtools/source/filter/wmf/winwmf.cxx
	svtools/source/filter/wmf/wmfwr.cxx
	svtools/source/graphic/graphic.cxx
	svtools/source/graphic/provider.cxx
	svtools/source/misc/transfer.cxx
	svx/inc/svx/xoutbmp.hxx
	svx/source/sdr/overlay/overlaymanagerbuffered.cxx
	svx/source/xoutdev/_xoutbmp.cxx
	sw/source/core/view/viewsh.cxx
	sw/source/filter/ww1/w1filter.cxx
	sw/source/filter/ww8/ww8par.hxx
	sw/source/ui/dochdl/swdtflvr.cxx
	toolkit/source/awt/vclxbitmap.cxx
	toolkit/source/helper/vclunohelper.cxx
	vcl/Library_vcl.mk
	vcl/Package_inc.mk
	vcl/aqua/source/dtrans/DataFlavorMapping.cxx
	vcl/aqua/source/dtrans/OSXTransferable.cxx
	vcl/aqua/source/dtrans/PictToBmpFlt.cxx
	vcl/aqua/source/dtrans/PictToBmpFlt.hxx
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/inc/vcl/pngwrite.hxx
	vcl/inc/vcl/salbtype.hxx
	vcl/inc/vcl/wall.hxx
	vcl/source/gdi/animate.cxx
	vcl/source/gdi/bitmap2.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/bmpconv.cxx
	vcl/source/gdi/cvtsvm.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/impimagetree.cxx
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/wall.cxx

Change-Id: I79938bc412c048c3d4e64f430f216e73bec16167
 2013-06-13 14:50:46 +01:00
Fridrich Štrba
b1a82bd284 mingw64: use integers of teh right size in framework 
Change-Id: Id10f827ef70a19a6261abea5c1b6c835b8bee701
 2013-06-10 14:03:37 +02:00
Caolán McNamara
7d257ffb13 misleading comment, beamer section, not removed helpagent section 
Change-Id: I1e4eb58809e471e9138895e7bb2e940a0299c1e9
 2013-06-06 13:33:27 +01:00
Noel Grandin
95c0d568fd use uno::Reference#clear() method... 
...instead of assigning an empty value. Reduces code noise.

Change-Id: Ic95b081a41fb740a738c92b3407a9514ccb8b06e
 2013-06-05 08:13:23 +02:00
Noel Grandin
8c799984cc fdo#46808, Convert the rest of XMultiServiceFactory in framework module 
Change-Id: Ife3caf00ab37a8c344f0ab90e40337b3b5bc1571
 2013-06-05 08:13:22 +02:00
Noel Grandin
c23be036a6 fdo#46808, Convert some XMultiservice in framework module 
Change-Id: Id4dd0bafd40cf96271527c9c970c4ab31527644c
 2013-06-05 08:13:22 +02:00
Noel Grandin
dcbaf7c253 remove unused componentcontext.hxx includes 
Change-Id: I598926b72c5540b472f9607e2f3df134a8c50048
 2013-06-05 08:13:21 +02:00
Noel Grandin
1f79707438 fdo#46808, Convert office::Quickstart service to new style 
Service already existed, just needed an IDL file.

Change-Id: Ief5563e53c7331b65dd429079180c4eed2f2c071
 2013-06-03 10:00:01 +02:00
Noel Grandin
d7fa9ca787 fdo#46808, Convert FrameLoaderFactory and ContentHandlerFactory to new style 
by creating a common service interface for them to implement

Change-Id: Icec85c55ed0ac13a6c785fdad6b0cd9c11878ba5
 2013-06-03 10:00:00 +02:00
Noel Grandin
30dd9b2ff5 fdo#46808, Convert SfxFrameLoader service to new style 
Change-Id: I6cdef298d69fef388e79b241abbe3a9a03d61492
 2013-06-03 09:59:59 +02:00
Noel Grandin
a8a35e54f5 fdo#46808, Convert frame::AppDispatchProvider to new style 
The service already existed, it just needed an IDL file.

Change-Id: I9553c8e7c4922f2106bc13034e0cc35669b28b7e
 2013-06-03 09:59:59 +02:00
Zolnai Tamás
8cc9383fe7 Replace invalid doxygen commands: thrown -> throws 
Change-Id: I9e9f513afe37ccf34f2d5762a27b4a728fd24f36
Reviewed-on: https://gerrit.libreoffice.org/4136
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
 2013-06-03 06:58:36 +00:00
Radu Ioan
660b67a413 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO 
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*

Change-Id: Id4e90b83a7275bfd30914f7514a609cebbfbf4ac
Reviewed-on: https://gerrit.libreoffice.org/4044
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
 2013-05-31 18:08:02 +00:00
Ariel Constenla-Haile
d0508f79c1 css::frame::XStatusbarController: add missing interface 
Added ::com::sun:⭐:lang::XComponent. IDL documentation taken from
http://wiki.openoffice.org/wiki/Framework/Tutorial/Statusbar_Controller#Status_bar_controller_service
(cherry picked from commit f3dc398e002926792a0c6160691d46eb75cad236)

Conflicts:
	framework/inc/uielement/statusbarmanager.hxx
	framework/source/uielement/statusbarmanager.cxx

Change-Id: Id2d768250632b12b834602a33a4e9923cec9bd3f
 2013-05-31 12:40:08 +02:00
Noel Grandin
e0fc16f769 fdo#46808, Convert some XMultiServiceFactory to XComponentContext 
Change-Id: I8272ecab34711654ed27625a571cf2553ffd7468
 2013-05-28 08:10:25 +02:00
Noel Grandin
c380b432e3 remove unnecessary parameter and field 
Change-Id: I10311ea88f69566d9e30308c0cff193dd5ddcd11
 2013-05-28 08:10:24 +02:00
Noel Grandin
5835d8d271 fdo#46808, Convert some XMultiServiceFactory to XComponentContext 
Change-Id: Ia55bb7af6e5d1c76f3cf8001ea53892e1e1bdac0
 2013-05-28 08:10:24 +02:00
Noel Grandin
052de9c16b fdo#46808, Convert some XMultiServiceFactory to XComponentContext 
Change-Id: I7223d8e2c962ca90eda08119ed73a034d334329d
 2013-05-28 08:10:24 +02:00
Noel Grandin
8f3cec9d7a fdo#46808, Convert ui:*AcceleratorConfiguration to new style 
The services already existed, they just needed IDL files.

API CHANGE:
   The return type of XUIConfigurationManager#getShortcutManager()
   is now XAcceleratorConfiguration instead of XInterface.
   This should not be a problem because XUIConfigurationManager is
   unpublished and the client code was relying on the service
   returning that type.

Change-Id: I399fe35de3394b02a4166b75eb7ff93b28be8bef
 2013-05-28 08:10:23 +02:00
Noel Grandin
aff5c4d76b fdo#46808, Use service constructor 
Change-Id: Ia943f806ebce8afebabc76d1f74ad792ded761a9
 2013-05-28 08:10:23 +02:00
Noel Grandin
95ec16b513 fdo#46808, Convert frame::LayoutManager service to new sty;e 
Change-Id: I46c3950aee336548d6e0acc6a7d1da655c158175
 2013-05-28 08:10:23 +02:00
Ariel Constenla-Haile
174e32567f Recent files menu in the StartModule should be the same as in the menubar 
(cherry picked from commit cbf0812a9bcd4287af1f5db0f2c30caf1508baa6)

Conflicts:
	framework/source/services/backingwindow.cxx
	framework/source/services/backingwindow.hxx

Change-Id: I49dc11e1cf9bd6831c16e53d24a131de4d565373
 2013-05-27 11:45:09 +01:00
Ariel Constenla-Haile
16db62a9c0 Recent file list: small fix when no documents 
(cherry picked from commit da18984094aa5ae4a66731bf581103298b133738)

Change-Id: I56413b68d28b206212561dcbf662940862cebeb7
 2013-05-26 20:39:03 +01:00
Ariel Constenla-Haile
1e85fc5b2d svt::ToolboxController clean-up 
Some small clean-up to use the PopupMenu ToolbarController

(cherry picked from commit e1687ce159e787d98f79d29a3d2131cca4b6ec71)

Conflicts:
	svtools/inc/svtools/toolboxcontroller.hxx
	svtools/source/uno/toolboxcontroller.cxx

Change-Id: Ie5e0397c32352d52cf2664bdbab920923e74bd03
 2013-05-26 20:39:02 +01:00
Tor Lillqvist
5944137e02 Fix warning: unused variable 'aURL' [loplugin] 
Change-Id: Ia7f3c2e774ece3cdc35a3a6d220d0eb44e5ad0f9
 2013-05-24 12:40:46 +03:00
Noel Grandin
9fa7dd98cc fix Mac build 
Change-Id: I7870cabf5a241d5255f0b2a6cf995c17b664fd27
 2013-05-22 15:46:15 +02:00
Noel Grandin
a726677724 fdo#46808, Convert XMultiServiceFactory to XComponentContext 
Change-Id: Ib5e6fb4d6a4ff8f2bd315f19bde5028be2c569ea
 2013-05-22 15:20:12 +02:00
Noel Grandin
fe1ac1bf90 fdo#46808, convert XMultiServiceFactory to XComponentContext 
Change-Id: I5ed0b12bf37e7d235fc88182c006a6ed07ef2343
 2013-05-22 15:20:07 +02:00
Noel Grandin
fe9f937f46 fdo#46808, Convert XMultiServiceFactory to XComponentContext 
Change-Id: I804845860bf28b2f87e0474bc54e821426473a0c
 2013-05-22 15:19:56 +02:00
Noel Grandin
1a2ab98ab8 fdo#46808, Convert XMultiServiceFactory to XComponentContext 
Change-Id: I4325e553d010bb93794f897b41a602a5f849d4a6
 2013-05-22 15:19:52 +02:00
Noel Grandin
122e4bc598 fdo#46808, XMultiServiceFactory to XComponentContext 
Change-Id: I2ca9a2930a921c600f5e93cc2e66d461220ea87d
 2013-05-22 15:19:49 +02:00
Noel Grandin
6a043e9c0a Use the new type-checking Reference constructor to reduce code noise 
Also create a Clang compiler plugin to detect such cases.

Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752
Reviewed-on: https://gerrit.libreoffice.org/4001
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
 2013-05-22 10:44:29 +00:00
Caolán McNamara
aad035bd70 add missing files 
Change-Id: I94dc9b99d243adf21f0439911899354781467da4
 2013-05-21 16:36:06 +01:00
Ariel Constenla-Haile
8b050d1e91 UI Controller Factory fixes 
- "ModuleName" --> "ModuleIdentifier": the IDL definition for
css::frame::PopupMenuControllerFactory and
css::frame::StatusbarControllerFactory tells to use a property named
"ModuleIdentifier", but in the code it is named "ModuleName"

- Undocumented css::frame::ToolbarControllerFactory

- Fix service name of ToolbarControllerFactory (ToolbarControllerFactory
instead of ToolBarControllerFactory)

- Convert the three service factories to new style, and use these
new-style services in the source code

- Implement multiple inheritance: added new css::frame::XUIControllerFactory

- Added a (true) base class and implemented the three factories in a
single file

(cherry picked from commit acc7fed28f54f836b0923180431a0c180f91e98c)

Conflicts:
	framework/inc/pch/precompiled_framework.hxx
	framework/inc/uielement/toolbarmanager.hxx
	framework/inc/uifactory/popupmenucontrollerfactory.hxx
	framework/inc/uifactory/statusbarcontrollerfactory.hxx
	framework/inc/uifactory/uicontrollerfactory.hxx
	framework/source/uielement/addonstoolbarmanager.cxx
	framework/source/uielement/menubarmanager.cxx
	framework/source/uielement/popupmenucontroller.cxx
	framework/source/uielement/statusbarmanager.cxx
	framework/source/uielement/toolbarmanager.cxx
	framework/source/uifactory/popupmenucontrollerfactory.cxx
	framework/source/uifactory/statusbarcontrollerfactory.cxx
	framework/source/uifactory/uicontrollerfactory.cxx
	framework/source/unotypes/fwk.xml
	offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
	offapi/com/sun/star/frame/StatusbarControllerFactory.idl
	offapi/com/sun/star/frame/makefile.mk
	svtools/source/uno/toolboxcontroller.cxx

Change-Id: Ia8580539badf650a84bc6e57a6b832071e011f0a
 2013-05-21 16:29:33 +01:00
Caolán McNamara
f4bccae9eb Revert "fdo#46808, Adapt frame::PopupMenuControllerFactory UNO service" 
This reverts commit e93a0018871ebea4da1959c72c06f3c7f4dc7b27.

Conflicts:
	desktop/source/app/app.cxx
	framework/source/uielement/menubarmanager.cxx
	framework/source/uielement/popupmenucontroller.cxx
	offapi/UnoApi_offapi.mk

Change-Id: I3d4d49f98603e75357fb315a603a10851b3a7090
 2013-05-21 16:29:33 +01:00
Caolán McNamara
e9679a4a76 Revert "fdo#46808, Create new-style frame::ToolBarControllerFactory service" 
This reverts commit ecae523d9603eaf7ff0acc98682576813e50c94a.

Conflicts:
	framework/source/uielement/toolbarmanager.cxx
	offapi/UnoApi_offapi.mk

Change-Id: I9f5fe49ffdf3176f0d742d28277c4ec2afbc1ed4
 2013-05-21 16:29:33 +01:00
Ariel Constenla-Haile
f59d23fedc Remove unused commented code 
(cherry picked from commit d8933b9c61e3e15f788f43043975f48d9d5b6cfd)

Change-Id: I9856e1f26f9467c281ebaabe3d520e4fa59163c4
 2013-05-21 14:01:18 +01:00
Ariel Constenla-Haile
4fcda14828 Related: #i121442# Remove unused UNO StatusbarControllers 
(cherry picked from commit 06b91eb4cc81dde86875445c5acaa5c57111333b)

Conflicts:
	framework/inc/uielement/logoimagestatusbarcontroller.hxx
	framework/inc/uielement/logotextstatusbarcontroller.hxx
	framework/inc/uielement/simpletextstatusbarcontroller.hxx
	framework/source/classes/resource.src
	framework/source/register/registerservices.cxx
	framework/source/uielement/logoimagestatusbarcontroller.cxx
	framework/source/uielement/logotextstatusbarcontroller.cxx
	framework/source/uielement/simpletextstatusbarcontroller.cxx
	officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

Change-Id: I799bd0fa29191efce4fe9a09f74247e38d8f8873
 2013-05-21 14:01:18 +01:00
Ariel Constenla-Haile
819840979b Related: #i121442# - Refactor UNO StatusbarControllers 
(cherry picked from commit 3f1dd0f6b392c104e0a7c7c2623d5d688f8622c0)

Conflicts:
	framework/source/uielement/langselectionstatusbarcontroller.cxx

Change-Id: I1e8f87d1fbd12bab98b38282cedc730ac23694c3
 2013-05-21 14:01:18 +01:00
Ariel Constenla-Haile
cfaac477e2 Related: #i121442# support status bar merging and StatusbarControllers 
framework refactoring and new code to support status bar merging and UNO
StatusbarControllers

(cherry picked from commit 0b3a77478cf2cfd245a87bc528f851e959a2e6c7)

Conflicts:
	framework/source/uielement/statusbarmanager.cxx
	framework/source/uielement/toolbarmerger.cxx

Change-Id: I334a220ff27bb365e98a0ebd8bc6e55d65e76d64
 2013-05-21 14:01:17 +01:00
Ariel Constenla-Haile
1768904fd9 Related: #i121442# Read Statusbar merging configuration 
(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882)

Conflicts:
	framework/inc/framework/addonsoptions.hxx
	framework/source/fwe/classes/addonsoptions.cxx

Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
 2013-05-21 14:01:17 +01:00
Noel Grandin
884217479d fdo#46808, Convert more XMultiServiceFactory to XComponentContext 
Change-Id: Ia9fe1a95aab5f466ce212e442eba791f265488b5
 2013-05-21 14:45:48 +02:00
Oliver-Rainer Wittmann
d02f75a8c3 Resolves: #i121420# merge sidebar feature 
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5)

Conflicts:
	chart2/source/controller/dialogs/dlg_View3D.cxx
	chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
	chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
	chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
	chart2/source/controller/inc/ViewElementListProvider.hxx
	chart2/source/controller/inc/dlg_View3D.hxx
	chart2/source/controller/main/ShapeController.cxx
	chart2/source/inc/chartview/DrawModelWrapper.hxx
	chart2/source/view/main/DrawModelWrapper.cxx
	cui/source/inc/border.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/inc/cuitabline.hxx
	cui/source/inc/sdrcelldlg.hxx
	cui/source/inc/treeopt.hxx
	cui/source/options/optchart.cxx
	cui/source/options/optchart.hxx
	cui/source/options/optcolor.cxx
	cui/source/options/treeopt.cxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/border.cxx
	cui/source/tabpages/chardlg.cxx
	cui/source/tabpages/numpages.cxx
	cui/source/tabpages/tpcolor.cxx
	cui/source/tabpages/tplneend.cxx
	editeng/inc/editeng/outliner.hxx
	extensions/source/propctrlr/standardcontrol.cxx
	framework/source/register/registerservices.cxx
	offapi/com/sun/star/ui/makefile.mk
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
	officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
	postprocess/packregistry/makefile.mk
	reportdesign/source/ui/dlg/Condition.cxx
	reportdesign/source/ui/misc/UITools.cxx
	sc/inc/document.hxx
	sc/inc/helpids.h
	sc/inc/sc.hrc
	sc/prj/build.lst
	sc/sdi/scalc.sdi
	sc/source/core/data/documen9.cxx
	sc/source/core/data/drwlayer.cxx
	sc/source/ui/app/scdll.cxx
	sc/source/ui/app/typemap.cxx
	sc/source/ui/dbgui/scendlg.cxx
	sc/source/ui/docshell/docsh2.cxx
	sc/source/ui/docshell/docsh4.cxx
	sc/source/ui/drawfunc/chartsh.cxx
	sc/source/ui/drawfunc/drawsh.cxx
	sc/source/ui/drawfunc/drawsh2.cxx
	sc/source/ui/drawfunc/drawsh4.cxx
	sc/source/ui/drawfunc/drformsh.cxx
	sc/source/ui/drawfunc/drtxtob.cxx
	sc/source/ui/drawfunc/drtxtob1.cxx
	sc/source/ui/drawfunc/drtxtob2.cxx
	sc/source/ui/drawfunc/graphsh.cxx
	sc/source/ui/drawfunc/oleobjsh.cxx
	sc/source/ui/inc/chartsh.hxx
	sc/source/ui/inc/formatsh.hxx
	sc/source/ui/miscdlgs/tabbgcolordlg.cxx
	sc/source/ui/navipi/navipi.cxx
	sc/source/ui/optdlg/opredlin.cxx
	sc/source/ui/optdlg/tpview.cxx
	sc/source/ui/sidebar/makefile.mk
	sc/source/ui/view/auditsh.cxx
	sc/source/ui/view/cellsh.cxx
	sc/source/ui/view/editsh.cxx
	sc/source/ui/view/formatsh.cxx
	sc/source/ui/view/pivotsh.cxx
	sc/source/ui/view/tabvwsh.cxx
	sc/util/makefile.mk
	sd/inc/sdabstdlg.hxx
	sd/prj/build.lst
	sd/sdi/ToolPanelViewShell.sdi
	sd/sdi/makefile.mk
	sd/source/ui/accessibility/makefile.mk
	sd/source/ui/animations/CustomAnimationDialog.cxx
	sd/source/ui/dlg/PaneChildWindows.cxx
	sd/source/ui/dlg/PaneShells.cxx
	sd/source/ui/dlg/copydlg.cxx
	sd/source/ui/dlg/navigatr.cxx
	sd/source/ui/dlg/sddlgfact.cxx
	sd/source/ui/dlg/sddlgfact.hxx
	sd/source/ui/docshell/docshel3.cxx
	sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
	sd/source/ui/framework/factories/TaskPanelFactory.cxx
	sd/source/ui/framework/factories/TaskPanelFactory.hxx
	sd/source/ui/framework/factories/ViewShellWrapper.cxx
	sd/source/ui/framework/factories/makefile.mk
	sd/source/ui/framework/module/ImpressModule.cxx
	sd/source/ui/framework/module/ToolPanelModule.cxx
	sd/source/ui/framework/tools/FrameworkHelper.cxx
	sd/source/ui/func/fuolbull.cxx
	sd/source/ui/inc/DrawViewShell.hxx
	sd/source/ui/inc/PaneChildWindows.hxx
	sd/source/ui/inc/celltempl.hxx
	sd/source/ui/inc/copydlg.hxx
	sd/source/ui/inc/dlgpage.hxx
	sd/source/ui/inc/framework/FrameworkHelper.hxx
	sd/source/ui/inc/prltempl.hxx
	sd/source/ui/inc/tabtempl.hxx
	sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
	sd/source/ui/inc/taskpane/PanelId.hxx
	sd/source/ui/inc/tpaction.hxx
	sd/source/ui/sidebar/AllMasterPagesSelector.cxx
	sd/source/ui/sidebar/AllMasterPagesSelector.hxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
	sd/source/ui/sidebar/DocumentHelper.cxx
	sd/source/ui/sidebar/DocumentHelper.hxx
	sd/source/ui/sidebar/LayoutMenu.cxx
	sd/source/ui/sidebar/LayoutMenu.hxx
	sd/source/ui/sidebar/MasterPageContainer.cxx
	sd/source/ui/sidebar/MasterPageContainer.hxx
	sd/source/ui/sidebar/MasterPageContainerFiller.cxx
	sd/source/ui/sidebar/MasterPageContainerFiller.hxx
	sd/source/ui/sidebar/MasterPageContainerProviders.cxx
	sd/source/ui/sidebar/MasterPageContainerProviders.hxx
	sd/source/ui/sidebar/MasterPageContainerQueue.cxx
	sd/source/ui/sidebar/MasterPageContainerQueue.hxx
	sd/source/ui/sidebar/MasterPageDescriptor.cxx
	sd/source/ui/sidebar/MasterPageDescriptor.hxx
	sd/source/ui/sidebar/MasterPageObserver.cxx
	sd/source/ui/sidebar/MasterPagesSelector.cxx
	sd/source/ui/sidebar/MasterPagesSelector.hxx
	sd/source/ui/sidebar/PreviewValueSet.cxx
	sd/source/ui/sidebar/PreviewValueSet.hxx
	sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
	sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
	sd/source/ui/sidebar/SidebarShellManager.cxx
	sd/source/ui/sidebar/SlideTransitionPanel.hxx
	sd/source/ui/sidebar/makefile.mk
	sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
	sd/source/ui/table/TableDesignPane.hxx
	sd/source/ui/toolpanel/ControlContainer.cxx
	sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
	sd/source/ui/toolpanel/MethodGuard.hxx
	sd/source/ui/toolpanel/ScrollPanel.cxx
	sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
	sd/source/ui/toolpanel/SubToolPanel.cxx
	sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
	sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
	sd/source/ui/toolpanel/TitleBar.cxx
	sd/source/ui/toolpanel/TitledControl.cxx
	sd/source/ui/toolpanel/ToolPanel.cxx
	sd/source/ui/toolpanel/ToolPanel.hxx
	sd/source/ui/toolpanel/ToolPanelFactory.cxx
	sd/source/ui/toolpanel/ToolPanelUIElement.cxx
	sd/source/ui/toolpanel/ToolPanelUIElement.hxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
	sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
	sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
	sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
	sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
	sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
	sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
	sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
	sd/source/ui/unoidl/UnoDocumentSettings.cxx
	sd/source/ui/view/ViewShellBase.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/drviews3.cxx
	sd/source/ui/view/drviews7.cxx
	sd/source/ui/view/drviewsa.cxx
	sd/source/ui/view/drviewsf.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/sdview.cxx
	sd/source/ui/view/viewshel.cxx
	sd/uiconfig/sdraw/menubar/menubar.xml
	sd/util/makefile.mk
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sfx.hrc
	sfx2/inc/sfx2/sfxsids.hrc
	sfx2/source/control/bindings.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/inc/templdgi.hxx
	svx/AllLangResTarget_svx.mk
	svx/Package_inc.mk
	svx/inc/svx/XPropertyTable.hxx
	svx/inc/svx/bmpmask.hxx
	svx/inc/svx/colrctrl.hxx
	svx/inc/svx/dialogs.hrc
	svx/inc/svx/dlgctrl.hxx
	svx/inc/svx/dlgutil.hxx
	svx/inc/svx/drawitem.hxx
	svx/inc/svx/fontwork.hxx
	svx/inc/svx/galbrws.hxx
	svx/inc/svx/sdr/table/tablecontroller.hxx
	svx/inc/svx/svdmodel.hxx
	svx/inc/svx/svdstr.hrc
	svx/inc/svx/svxids.hrc
	svx/inc/svx/svxitems.hrc
	svx/inc/svx/xattr.hxx
	svx/inc/svx/xflgrit.hxx
	svx/inc/svx/xflhtit.hxx
	svx/inc/svx/xit.hxx
	svx/inc/svx/xlineit.hxx
	svx/inc/svx/xlndsit.hxx
	svx/inc/svx/xlnedit.hxx
	svx/inc/svx/xlnstit.hxx
	svx/inc/svx/xtable.hxx
	svx/sdi/svx.sdi
	svx/source/dialog/_bmpmask.cxx
	svx/source/dialog/dialcontrol.cxx
	svx/source/dialog/dlgctrl.cxx
	svx/source/dialog/dlgutil.cxx
	svx/source/dialog/fontwork.cxx
	svx/source/gallery2/galbrws.cxx
	svx/source/gallery2/galbrws1.cxx
	svx/source/gallery2/gallery1.cxx
	svx/source/items/drawitem.cxx
	svx/source/items/svxitems.src
	svx/source/sdr/attribute/sdrformtextattribute.cxx
	svx/source/sidebar/ColorPanel.hxx
	svx/source/sidebar/EmptyPanel.hrc
	svx/source/sidebar/EmptyPanel.hxx
	svx/source/sidebar/gallery/GalleryPanel.hxx
	svx/source/svdraw/svdedtv1.cxx
	svx/source/svdraw/svdmodel.cxx
	svx/source/svdraw/svdogrp.cxx
	svx/source/svdraw/svdstr.src
	svx/source/tbxctrls/tbcontrl.cxx
	svx/source/unodraw/XPropertyTable.cxx
	svx/source/unodraw/unoctabl.cxx
	svx/source/xoutdev/XPropertyEntry.cxx
	svx/source/xoutdev/xattr.cxx
	svx/source/xoutdev/xattr2.cxx
	svx/source/xoutdev/xtabbtmp.cxx
	svx/source/xoutdev/xtabcolr.cxx
	svx/source/xoutdev/xtabdash.cxx
	svx/source/xoutdev/xtabgrdt.cxx
	svx/source/xoutdev/xtabhtch.cxx
	svx/source/xoutdev/xtable.cxx
	svx/source/xoutdev/xtablend.cxx
	svx/util/svx.component
	sw/inc/cmdid.h
	sw/inc/docsh.hxx
	sw/inc/editsh.hxx
	sw/inc/helpid.h
	sw/inc/rcid.hrc
	sw/inc/swabstdlg.hxx
	sw/inc/swcommands.h
	sw/sdi/swriter.sdi
	sw/source/core/doc/docdesc.cxx
	sw/source/core/draw/drawdoc.cxx
	sw/source/ui/app/docsh2.cxx
	sw/source/ui/app/docshdrw.cxx
	sw/source/ui/app/docshini.cxx
	sw/source/ui/app/docst.cxx
	sw/source/ui/config/optpage.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/dialog/swdlgfact.hxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/inc/tmpdlg.hxx
	sw/source/ui/misc/pggrid.cxx
	sw/source/ui/shells/annotsh.cxx
	sw/source/ui/shells/basesh.cxx
	sw/source/ui/shells/beziersh.cxx
	sw/source/ui/shells/drawdlg.cxx
	sw/source/ui/shells/drawsh.cxx
	sw/source/ui/shells/drformsh.cxx
	sw/source/ui/shells/drwbassh.cxx
	sw/source/ui/shells/drwtxtex.cxx
	sw/source/ui/shells/drwtxtsh.cxx
	sw/source/ui/shells/frmsh.cxx
	sw/source/ui/shells/grfsh.cxx
	sw/source/ui/shells/olesh.cxx
	sw/source/ui/shells/tabsh.cxx
	sw/source/ui/shells/textsh.cxx
	sw/source/ui/shells/textsh1.cxx
	sw/source/ui/shells/txtnum.cxx
	sw/source/ui/uiview/viewtab.cxx
	sw/source/ui/uno/unofreg.cxx
	sw/source/ui/utlui/navipi.cxx
	sw/util/sw.component
	vcl/inc/vcl/split.hxx
	vcl/inc/vcl/window.hxx
	vcl/inc/window.h
	vcl/source/window/split.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window4.cxx

Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e

Resolves: #i122194# Adapted license text in propertypanel.hrc

then renamed it to ResourceDefinitions.hrc

(cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b)

Conflicts:
	sfx2/Package_inc.mk
	sfx2/source/sidebar/SidebarChildWindow.cxx
	svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
	svx/source/sidebar/line/LinePropertyPanel.cxx
	svx/source/sidebar/possize/PosSizePropertyPanel.cxx
	sw/source/ui/sidebar/PagePropertyPanel.src
	sw/source/ui/sidebar/WrapPropertyPanel.src

Change-Id: Ie009056a78ab108556717a501399c83b477b3548

Resolves: #i122194# finally I got the correct file name

Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a

More merge changes for optional sidebar:
     revert toolpanel removal, restore and re-enable task pane
     remove apparently un-used SidebarFactory module
     add extra visibility annotation to ItemReceiverUpdate
 2013-05-20 11:33:10 +01:00
Ricardo Montania
8a9448aabc String.AppendAscii Drop 
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
https://gerrit.libreoffice.org/#/c/3892/

Change-Id: I12175a81f0a74546b5e00633176f204b9a3fb35c
 2013-05-15 15:58:17 +02:00
Tor Lillqvist
cb6d67c21f Spelling "separate" (etc) correctly is hard 2013-05-15 11:14:28 +03:00
Stephan Bergmann
ee47dfa474 LockHelper::getGlobalLock is never called with an argument 
Change-Id: I90b431345d791c887f9047258a6f439bcf222784
 2013-05-14 14:41:55 +02:00
Stephan Bergmann
4af8a94a96 Remove unused LOCKTYPE_FRAMEWORK env var override 
...which means that only the E_SOLARMUTEX part of LockHelper is ever used.

Change-Id: Ibff0bda324af67c85cbd2975d308c612c66e5052
 2013-05-14 14:41:55 +02:00
Stephan Bergmann
61ac80a6f6 ENABLE_MUTEXDEBUG is never defined 
Change-Id: I533cc7041177cceff14d1e44e4cd1d25d5e94c11
 2013-05-14 14:41:55 +02:00