ba0a57702c
remove OUString wrap for string literals
...
For some functions and all kinds of Exceptions.
CannotConvertException
CloseVetoException
DisposedException
EmptyUndoStackException
ErrorCodeIOException
Exception
GridInvalidDataException
GridInvalidModelException
IOException
IllegalAccessException
IllegalArgumentException
IllegalTypeException
IndexOutOfBoundsException
NoMasterException
NoSuchElementException
NoSupportException
PropertyVetoException
RuntimeException
SAXException
ScannerException
StorageWrappedTargetException
UnsupportedFlavorException
VetoException
WrappedTargetException
ZipIOException
throwGenericSQLException
throwIllegallArgumentException
createInstance
createInstanceWithContext
forName
getByName
getPackageManager
getPropertyValue
getUnpackedValueOrDefault
getValueByName
hasPropertyByName
openKey
setName
setPropertyValue
supportsService
bash command:
for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx'
| cut -d ':' -f1 | sort -u
| xargs sed -i
-e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g"
-e "s/\($i.*\)\"+ /\1\" + /g";
done
Change-Id: Iaf8e641b0abf28c082906014f87a183517630535
Reviewed-on: https://gerrit.libreoffice.org/4624
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org >
Reviewed-by: Thomas Arnhold <thomas@arnhold.org >
Tested-by: Thomas Arnhold <thomas@arnhold.org >
2013-06-29 21:52:54 +00:00
5cb2e3104b
remove toolkit/unohlp.hxx hack
...
Change-Id: Idb9971d848870f4d00dbf77e80e48bf7dfde8913
Reviewed-on: https://gerrit.libreoffice.org/4601
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org >
Tested-by: Fridrich Strba <fridrich@documentfoundation.org >
2013-06-28 11:49:28 +00:00
126827b0fd
fdo#43460 framework,i18npool,accessibility: use isEmpty()
...
Change-Id: I4cd9841127b1d4a294d7f001b646259c61eb1172
Reviewed-on: https://gerrit.libreoffice.org/4443
Reviewed-by: Michael Stahl <mstahl@redhat.com >
Tested-by: Michael Stahl <mstahl@redhat.com >
2013-06-24 21:45:42 +00:00
85f072ef33
Resolves: #i121577# Allow setting toolbar name in Addons.xcu
...
(cherry picked from commit 37894067213a63c51c7a73083d7b0ace5f5c40da)
Conflicts:
framework/inc/framework/addonsoptions.hxx
framework/source/fwe/classes/addonsoptions.cxx
framework/source/layoutmanager/toolbarlayoutmanager.cxx
officecfg/registry/schema/org/openoffice/Office/Addons.xcs
Change-Id: Icc8ed1bb5ac2cfecd6c03c53c137c503dc78bc66
2013-06-24 11:49:53 +01:00
f97ca6f651
Resolves: #i116455# Make toolbar style settings persistent
...
(cherry picked from commit fff79c8807c5b174507888a8e393f2605b28ea29)
Conflicts:
framework/source/layoutmanager/toolbarlayoutmanager.cxx
Change-Id: I25bfff7116c04aa6e40a062ce465960e50f68f7c
2013-06-24 11:30:47 +01:00
2f3e79ee90
Resolves: #i122401# framework::NewToolbarController needs...
...
early initialization of its PopupMenu
(cherry picked from commit 5149ad822bb66cca9561b7c181c6c2279affc29a)
Conflicts:
framework/inc/uielement/popuptoolbarcontroller.hxx
framework/source/uielement/popuptoolbarcontroller.cxx
Change-Id: I619fe7b86a19b146079792a73a50d23682d04a3c
2013-06-24 11:25:35 +01:00
57207cab00
Add missing copy&paste of SfxAppToolBoxControl_Impl::Select
...
(cherry picked from commit 47204c74d9e52f54f6983af19b66af2a96b42e61)
Conflicts:
framework/inc/uielement/popuptoolbarcontroller.hxx
svtools/inc/svtools/toolboxcontroller.hxx
Change-Id: I304d17c662450f29eeffb17f576b418986f3fb0a
2013-06-24 11:25:34 +01:00
a1748501d8
Kill SfxAppToolBoxControl_Impl
...
(cherry picked from commit 273121f8d7e277e35c8e5a8aad46ef0c103ebc03)
Conflicts:
sfx2/inc/sfx2/mnuitem.hxx
sfx2/inc/sfx2/tbxctrl.hxx
sfx2/source/appl/appreg.cxx
sfx2/source/menu/mnuitem.cxx
sfx2/source/toolbox/tbxitem.cxx
Change-Id: I6d0750d89ad009f82c5552d971537b78e45426f2
Silence warning C4706
(cherry picked from commit 0b373b3e4c45d09c40a8949e9366adb9b991de4b)
Change-Id: Id497469eba8288565145c47c84b7938a1316c21a
2013-06-24 11:25:34 +01:00
a659ac906a
framework::PopupMenuController clean-up
...
Changed the name, it is not a PopupMenuController, but a ToolbarController that
shows a PopupMenu filled at runtime by a PopupMenuController
Make it a base class for other ToolbarController components, there is no sense
to make it a component by itself
Use this base class for three new pure UNO ToolbarController's
(cherry picked from commit 9d1015051c92900def3d465d2eb8bf179f19a398)
Conflicts:
framework/Library_fwk.mk
framework/inc/uielement/popupmenucontroller.hxx
framework/source/uielement/popupmenucontroller.cxx
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Change-Id: I2f5ec06df098d65ffaa17a8f7f6f3ea8774b43c3
2013-06-24 10:08:43 +01:00
9052caae53
Resolves: #i121542# Unify the Menu API
...
(cherry picked from commit 399946b82f5efec19cd82d1c320d5aa9295d235d)
Conflicts:
chart2/source/controller/main/ChartController_Window.cxx
framework/source/uielement/langselectionmenucontroller.cxx
framework/source/uielement/popupmenucontroller.cxx
framework/source/uielement/recentfilesmenucontroller.cxx
framework/source/uielement/toolbarsmenucontroller.cxx
odk/examples/DevelopersGuide/GUI/UnoMenu.java
odk/examples/DevelopersGuide/GUI/UnoMenu2.java
odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx
offapi/com/sun/star/awt/MenuBar.idl
offapi/com/sun/star/awt/MenuEvent.idl
offapi/com/sun/star/awt/MenuItemStyle.idl
offapi/com/sun/star/awt/MenuItemType.idl
offapi/com/sun/star/awt/MenuLogo.idl
offapi/com/sun/star/awt/PopupMenu.idl
offapi/com/sun/star/awt/PopupMenuDirection.idl
offapi/com/sun/star/awt/XMenu.idl
offapi/com/sun/star/awt/XMenuBar.idl
offapi/com/sun/star/awt/XMenuBarExtended.idl
offapi/com/sun/star/awt/XMenuExtended.idl
offapi/com/sun/star/awt/XMenuExtended2.idl
offapi/com/sun/star/awt/XMenuListener.idl
offapi/com/sun/star/awt/XPopupMenu.idl
offapi/com/sun/star/awt/XPopupMenuExtended.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
svtools/inc/svtools/popupmenucontrollerbase.hxx
svtools/source/uno/popupmenucontrollerbase.cxx
svx/source/tbxctrls/extrusioncontrols.cxx
toolkit/inc/pch/precompiled_toolkit.hxx
toolkit/inc/toolkit/awt/vclxmenu.hxx
toolkit/inc/toolkit/helper/listenermultiplexer.hxx
toolkit/source/awt/vclxmenu.cxx
Change-Id: I3d9a1e109b9ff35901a3075b44a4c27e7c12b5c7
Related: #i121542# css::awt::XPopupMenu::execute() needs a Rectangle
(cherry picked from commit c01a6f4f370b72f0751cf4f5c11310682e2b3248)
Conflicts:
odk/examples/DevelopersGuide/GUI/UnoMenu2.java
offapi/type_reference/types.rdb
toolkit/inc/toolkit/awt/vclxmenu.hxx
Change-Id: I2cccc95086fe3d1522d03346e3c577fb2f21f621
2013-06-23 21:16:14 +01:00
4a0247603e
Small (hopefully non-controversial) changes to the existing branding
...
* Make sure about window background covers entire window
* Make sure start center images are centred
Change-Id: I402448ef4ea77633fe4e1ad5d5f93952efb495af
Reviewed-on: https://gerrit.libreoffice.org/4308
Reviewed-by: Thorsten Behrens <tbehrens@suse.com >
Tested-by: Thorsten Behrens <tbehrens@suse.com >
2013-06-18 11:43:10 +00:00
e7d0b21458
add missing modelines.
...
Change-Id: Ia0472d4dbce203f0b813e353b4b29f9dc9618664
2013-06-16 02:57:07 +01:00
14ed0d1629
cppcheck: fix redundant assignments
...
Change-Id: I3fb495c6e18b3cb5e9d4beca4212d4aa8097401e
2013-06-13 20:36:56 +02:00
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
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
b1a82bd284
mingw64: use integers of teh right size in framework
...
Change-Id: Id10f827ef70a19a6261abea5c1b6c835b8bee701
2013-06-10 14:03:37 +02:00
efb6d8211d
Fix some typos found by Noel Grandin
...
(cherry picked from commit 9271c50c2d02b708cbe274568c455ff900595884)
Conflicts:
qadevOOo/runner/lib/Status.java
qadevOOo/runner/util/PropertyName.java
Change-Id: I6157d7e4da5eeb85f3b748ab70cc6528b3d061a2
2013-06-07 16:07:53 +01:00
7d257ffb13
misleading comment, beamer section, not removed helpagent section
...
Change-Id: I1e4eb58809e471e9138895e7bb2e940a0299c1e9
2013-06-06 13:33:27 +01:00
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
8c799984cc
fdo#46808, Convert the rest of XMultiServiceFactory in framework module
...
Change-Id: Ife3caf00ab37a8c344f0ab90e40337b3b5bc1571
2013-06-05 08:13:22 +02:00
c23be036a6
fdo#46808, Convert some XMultiservice in framework module
...
Change-Id: Id4dd0bafd40cf96271527c9c970c4ab31527644c
2013-06-05 08:13:22 +02:00
dcbaf7c253
remove unused componentcontext.hxx includes
...
Change-Id: I598926b72c5540b472f9607e2f3df134a8c50048
2013-06-05 08:13:21 +02:00
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
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
30dd9b2ff5
fdo#46808, Convert SfxFrameLoader service to new style
...
Change-Id: I6cdef298d69fef388e79b241abbe3a9a03d61492
2013-06-03 09:59:59 +02:00
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
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
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
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
e0fc16f769
fdo#46808, Convert some XMultiServiceFactory to XComponentContext
...
Change-Id: I8272ecab34711654ed27625a571cf2553ffd7468
2013-05-28 08:10:25 +02:00
c380b432e3
remove unnecessary parameter and field
...
Change-Id: I10311ea88f69566d9e30308c0cff193dd5ddcd11
2013-05-28 08:10:24 +02:00
5835d8d271
fdo#46808, Convert some XMultiServiceFactory to XComponentContext
...
Change-Id: Ia55bb7af6e5d1c76f3cf8001ea53892e1e1bdac0
2013-05-28 08:10:24 +02:00
052de9c16b
fdo#46808, Convert some XMultiServiceFactory to XComponentContext
...
Change-Id: I7223d8e2c962ca90eda08119ed73a034d334329d
2013-05-28 08:10:24 +02:00
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
aff5c4d76b
fdo#46808, Use service constructor
...
Change-Id: Ia943f806ebce8afebabc76d1f74ad792ded761a9
2013-05-28 08:10:23 +02:00
95ec16b513
fdo#46808, Convert frame::LayoutManager service to new sty;e
...
Change-Id: I46c3950aee336548d6e0acc6a7d1da655c158175
2013-05-28 08:10:23 +02:00
eaad3098c6
Make .uno:Open a drop-down toolbar item
...
(cherry picked from commit b38a51d67373daf9a45a4701e7c760c7b3571a66)
Conflicts:
chart2/uiconfig/toolbar/standardbar.xml
dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
sc/uiconfig/scalc/toolbar/standardbar.xml
sd/uiconfig/sdraw/toolbar/standardbar.xml
starmath/uiconfig/smath/toolbar/standardbar.xml
sw/uiconfig/sglobal/toolbar/standardbar.xml
sw/uiconfig/sweb/toolbar/standardbar.xml
sw/uiconfig/swform/toolbar/standardbar.xml
sw/uiconfig/swreport/toolbar/standardbar.xml
sw/uiconfig/swriter/toolbar/standardbar.xml
sw/uiconfig/swxform/toolbar/standardbar.xml
Change-Id: Iac0c7e8e474e8d217ca4daf47232019c64ca888f
2013-05-27 12:22:35 +01:00
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
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
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
5944137e02
Fix warning: unused variable 'aURL' [loplugin]
...
Change-Id: Ia7f3c2e774ece3cdc35a3a6d220d0eb44e5ad0f9
2013-05-24 12:40:46 +03:00
9fa7dd98cc
fix Mac build
...
Change-Id: I7870cabf5a241d5255f0b2a6cf995c17b664fd27
2013-05-22 15:46:15 +02:00
a726677724
fdo#46808, Convert XMultiServiceFactory to XComponentContext
...
Change-Id: Ib5e6fb4d6a4ff8f2bd315f19bde5028be2c569ea
2013-05-22 15:20:12 +02:00
fe1ac1bf90
fdo#46808, convert XMultiServiceFactory to XComponentContext
...
Change-Id: I5ed0b12bf37e7d235fc88182c006a6ed07ef2343
2013-05-22 15:20:07 +02:00
fe9f937f46
fdo#46808, Convert XMultiServiceFactory to XComponentContext
...
Change-Id: I804845860bf28b2f87e0474bc54e821426473a0c
2013-05-22 15:19:56 +02:00
1a2ab98ab8
fdo#46808, Convert XMultiServiceFactory to XComponentContext
...
Change-Id: I4325e553d010bb93794f897b41a602a5f849d4a6
2013-05-22 15:19:52 +02:00
122e4bc598
fdo#46808, XMultiServiceFactory to XComponentContext
...
Change-Id: I2ca9a2930a921c600f5e93cc2e66d461220ea87d
2013-05-22 15:19:49 +02:00
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
aad035bd70
add missing files
...
Change-Id: I94dc9b99d243adf21f0439911899354781467da4
2013-05-21 16:36:06 +01:00
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
