[Libreoffice-commits] core.git: 16 commits - accessibility/source basctl/source idl/source include/sfx2 include/svx sc/inc sc/source sd/inc sd/source sfx2/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/source toolkit/source
Jan Holesovsky
kendy at collabora.com
Fri Apr 18 13:53:20 PDT 2014
accessibility/source/extended/textwindowaccessibility.cxx | 134 -
accessibility/source/helper/acc_factory.cxx | 750 +++++------
basctl/source/basicide/basdoc.cxx | 6
basctl/source/basicide/basdoc.hxx | 6
basctl/source/basicide/basidesh.cxx | 12
basctl/source/inc/basidesh.hxx | 5
idl/source/objects/object.cxx | 8
idl/source/objects/slot.cxx | 11
include/sfx2/app.hxx | 6
include/sfx2/module.hxx | 6
include/sfx2/msg.hxx | 5
include/sfx2/objface.hxx | 2
include/sfx2/objsh.hxx | 5
include/sfx2/shell.hxx | 34
include/sfx2/viewfrm.hxx | 6
include/sfx2/viewsh.hxx | 6
include/svx/SpellDialogChildWindow.hxx | 2
include/svx/extrusionbar.hxx | 7
include/svx/fmshell.hxx | 5
include/svx/fontworkbar.hxx | 7
sc/inc/scmod.hxx | 5
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 11
sc/source/ui/app/scmod.cxx | 11
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/drawfunc/chartsh.cxx | 11
sc/source/ui/drawfunc/drawsh.cxx | 15
sc/source/ui/drawfunc/drformsh.cxx | 11
sc/source/ui/drawfunc/drtxtob.cxx | 14
sc/source/ui/drawfunc/graphsh.cxx | 11
sc/source/ui/drawfunc/mediash.cxx | 9
sc/source/ui/drawfunc/oleobjsh.cxx | 11
sc/source/ui/inc/auditsh.hxx | 15
sc/source/ui/inc/cellsh.hxx | 6
sc/source/ui/inc/chartsh.hxx | 16
sc/source/ui/inc/docsh.hxx | 6
sc/source/ui/inc/drawsh.hxx | 5
sc/source/ui/inc/drformsh.hxx | 11
sc/source/ui/inc/drtxtob.hxx | 9
sc/source/ui/inc/editsh.hxx | 9
sc/source/ui/inc/formatsh.hxx | 7
sc/source/ui/inc/graphsh.hxx | 10
sc/source/ui/inc/mediash.hxx | 14
sc/source/ui/inc/oleobjsh.hxx | 12
sc/source/ui/inc/pgbrksh.hxx | 10
sc/source/ui/inc/pivotsh.hxx | 13
sc/source/ui/inc/prevwsh.hxx | 6
sc/source/ui/inc/tabvwsh.hxx | 5
sc/source/ui/view/auditsh.cxx | 5
sc/source/ui/view/cellsh.cxx | 12
sc/source/ui/view/editsh.cxx | 5
sc/source/ui/view/formatsh.cxx | 11
sc/source/ui/view/pgbrksh.cxx | 4
sc/source/ui/view/pivotsh.cxx | 4
sc/source/ui/view/prevwsh.cxx | 12
sc/source/ui/view/tabvwsh.cxx | 89 -
sd/inc/sdmod.hxx | 6
sd/source/ui/app/sdmod.cxx | 5
sd/source/ui/dlg/PaneShells.cxx | 24
sd/source/ui/docshell/docshell.cxx | 5
sd/source/ui/docshell/grdocsh.cxx | 4
sd/source/ui/inc/BezierObjectBar.hxx | 9
sd/source/ui/inc/DrawDocShell.hxx | 6
sd/source/ui/inc/DrawViewShell.hxx | 6
sd/source/ui/inc/GraphicDocShell.hxx | 7
sd/source/ui/inc/GraphicObjectBar.hxx | 7
sd/source/ui/inc/GraphicViewShell.hxx | 5
sd/source/ui/inc/MediaObjectBar.hxx | 7
sd/source/ui/inc/OutlineViewShell.hxx | 6
sd/source/ui/inc/PaneShells.hxx | 22
sd/source/ui/inc/PresentationViewShell.hxx | 5
sd/source/ui/inc/SlideSorterViewShell.hxx | 6
sd/source/ui/inc/TextObjectBar.hxx | 6
sd/source/ui/inc/ViewShellBase.hxx | 5
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 9
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 9
sd/source/ui/table/tableobjectbar.cxx | 8
sd/source/ui/table/tableobjectbar.hxx | 6
sd/source/ui/view/GraphicObjectBar.cxx | 8
sd/source/ui/view/MediaObjectBar.cxx | 9
sd/source/ui/view/ViewShellBase.cxx | 3
sd/source/ui/view/drbezob.cxx | 3
sd/source/ui/view/drtxtob.cxx | 8
sd/source/ui/view/drvwshrg.cxx | 75 -
sd/source/ui/view/outlnvsh.cxx | 34
sd/source/ui/view/presvish.cxx | 26
sfx2/source/appl/appmisc.cxx | 38
sfx2/source/appl/appuno.cxx | 44
sfx2/source/appl/module.cxx | 8
sfx2/source/control/shell.cxx | 3
sfx2/source/doc/objserv.cxx | 8
sfx2/source/view/viewfrm.cxx | 13
sfx2/source/view/viewsh.cxx | 5
starmath/inc/document.hxx | 6
starmath/inc/smmod.hxx | 7
starmath/inc/view.hxx | 5
starmath/source/document.cxx | 9
starmath/source/smmod.cxx | 8
starmath/source/view.cxx | 17
svtools/source/misc/svtaccessiblefactory.cxx | 14
svx/source/form/fmshell.cxx | 63
svx/source/toolbars/extrusionbar.cxx | 30
svx/source/toolbars/fontworkbar.cxx | 27
sw/inc/docsh.hxx | 5
sw/inc/swmodule.hxx | 5
sw/inc/wdocsh.hxx | 6
sw/source/core/uibase/app/apphdl.cxx | 12
sw/source/core/uibase/app/docsh.cxx | 4
sw/source/core/uibase/inc/annotsh.hxx | 5
sw/source/core/uibase/inc/basesh.hxx | 5
sw/source/core/uibase/inc/beziersh.hxx | 5
sw/source/core/uibase/inc/drawsh.hxx | 5
sw/source/core/uibase/inc/drformsh.hxx | 5
sw/source/core/uibase/inc/drwbassh.hxx | 11
sw/source/core/uibase/inc/drwtxtsh.hxx | 8
sw/source/core/uibase/inc/frmsh.hxx | 6
sw/source/core/uibase/inc/glshell.hxx | 12
sw/source/core/uibase/inc/grfsh.hxx | 5
sw/source/core/uibase/inc/listsh.hxx | 5
sw/source/core/uibase/inc/mediash.hxx | 5
sw/source/core/uibase/inc/navsh.hxx | 14
sw/source/core/uibase/inc/olesh.hxx | 6
sw/source/core/uibase/inc/pview.hxx | 5
sw/source/core/uibase/inc/srcview.hxx | 6
sw/source/core/uibase/inc/tabsh.hxx | 5
sw/source/core/uibase/inc/textsh.hxx | 6
sw/source/core/uibase/inc/view.hxx | 6
sw/source/core/uibase/inc/wformsh.hxx | 8
sw/source/core/uibase/inc/wfrmsh.hxx | 6
sw/source/core/uibase/inc/wgrfsh.hxx | 4
sw/source/core/uibase/inc/wlistsh.hxx | 10
sw/source/core/uibase/inc/wolesh.hxx | 9
sw/source/core/uibase/inc/wtabsh.hxx | 9
sw/source/core/uibase/inc/wtextsh.hxx | 6
sw/source/core/uibase/inc/wview.hxx | 7
sw/source/core/uibase/misc/glshell.cxx | 8
sw/source/core/uibase/shells/annotsh.cxx | 7
sw/source/core/uibase/shells/basesh.cxx | 6
sw/source/core/uibase/shells/beziersh.cxx | 7
sw/source/core/uibase/shells/drawsh.cxx | 10
sw/source/core/uibase/shells/drformsh.cxx | 7
sw/source/core/uibase/shells/drwbassh.cxx | 2
sw/source/core/uibase/shells/drwtxtsh.cxx | 10
sw/source/core/uibase/shells/frmsh.cxx | 7
sw/source/core/uibase/shells/grfsh.cxx | 7
sw/source/core/uibase/shells/listsh.cxx | 4
sw/source/core/uibase/shells/mediash.cxx | 7
sw/source/core/uibase/shells/navsh.cxx | 2
sw/source/core/uibase/shells/olesh.cxx | 7
sw/source/core/uibase/shells/tabsh.cxx | 7
sw/source/core/uibase/shells/textsh.cxx | 20
sw/source/core/uibase/uiview/pview.cxx | 17
sw/source/core/uibase/uiview/srcview.cxx | 15
sw/source/core/uibase/uiview/view0.cxx | 40
sw/source/core/uibase/web/wdocsh.cxx | 5
sw/source/core/uibase/web/wformsh.cxx | 7
sw/source/core/uibase/web/wfrmsh.cxx | 7
sw/source/core/uibase/web/wgrfsh.cxx | 7
sw/source/core/uibase/web/wlistsh.cxx | 4
sw/source/core/uibase/web/wolesh.cxx | 7
sw/source/core/uibase/web/wtabsh.cxx | 7
sw/source/core/uibase/web/wtextsh.cxx | 12
sw/source/core/uibase/web/wview.cxx | 16
toolkit/source/helper/accessibilityclient.cxx | 11
163 files changed, 1461 insertions(+), 1102 deletions(-)
New commits:
commit a7ee8316f7503db89874ee44daa56edf8e3e027f
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 18 22:44:01 2014 +0200
non-desktop: Avoid accessibility.
When using the tiled rendering, LibreOffice provides only the content, so no
need to instantiate accessibility.
Change-Id: Ibc0ff672aa960409fa660a750f8f02c9261041be
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index d29a7a7..ed4d2da 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/helper/accessiblefactory.hxx>
#include <svtools/accessiblefactory.hxx>
@@ -495,6 +497,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabB
} // anonymous namespace
+#if HAVE_FEATURE_DESKTOP
/* this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
by this library
@@ -511,7 +514,6 @@ extern "C"
}
}
-
/** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied
by this library
@@ -527,5 +529,6 @@ extern "C"
return pFactory;
}
}
+#endif // HAVE_FEATURE_DESKTOP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index fe8c206..5ad5fa7 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include "svtaccessiblefactory.hxx"
#include <boost/noncopyable.hpp>
@@ -37,11 +39,8 @@
// implemented therein would affect a static ref count, the acc lib could care
// for unloading itself.
-
namespace svt
{
-
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::accessibility;
@@ -257,12 +256,13 @@ namespace svt
{
}
-
+#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
extern "C" { static void SAL_CALL thisModule() {} }
#else
extern "C" void* getSvtAccessibilityComponentFactory();
#endif
+#endif // HAVE_FEATURE_DESKTOP
void AccessibleFactoryAccess::ensureInitialized()
{
@@ -275,6 +275,8 @@ namespace svt
if ( 1 == osl_atomic_increment( &s_nAccessibleFactoryAccesss ) )
{ // the first client
#endif // UNLOAD_ON_LAST_CLIENT_DYING
+
+#if HAVE_FEATURE_DESKTOP
// load the library implementing the factory
if ( !s_pFactory.get() )
{
@@ -291,7 +293,8 @@ namespace svt
OSL_ENSURE( s_pAccessibleFactoryFunc, "ac_registerClient: could not load the library, or not retrieve the needed symbol!" );
#else
s_pAccessibleFactoryFunc = getSvtAccessibilityComponentFactory;
-#endif
+#endif // DISABLE_DYNLOADING
+
// get a factory instance
if ( s_pAccessibleFactoryFunc )
{
@@ -303,6 +306,7 @@ namespace svt
}
}
}
+#endif // HAVE_FEATURE_DESKTOP
if ( !s_pFactory.get() )
// the attempt to load the lib, or to create the factory, failed
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 8c77223..4a02a50 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <sal/config.h>
#include <boost/noncopyable.hpp>
@@ -182,12 +184,13 @@ namespace toolkit
{
}
-
+#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
extern "C" { static void SAL_CALL thisModule() {} }
#else
extern "C" void *getStandardAccessibleFactory();
#endif
+#endif // HAVE_FEATURE_DESKTOP
void AccessibilityClient::ensureInitialized()
{
@@ -200,6 +203,8 @@ namespace toolkit
if ( 1 == osl_atomic_increment( &s_nAccessibilityClients ) )
{ // the first client
#endif // UNLOAD_ON_LAST_CLIENT_DYING
+
+#if HAVE_FEATURE_DESKTOP
// load the library implementing the factory
if ( !s_pFactory.get() )
{
@@ -217,7 +222,7 @@ namespace toolkit
OSL_ENSURE( s_pAccessibleFactoryFunc, "AccessibilityClient::ensureInitialized: could not load the library, or not retrieve the needed symbol!" );
#else
s_pAccessibleFactoryFunc = getStandardAccessibleFactory;
-#endif
+#endif // DISABLE_DYNLOADING
// get a factory instance
if ( s_pAccessibleFactoryFunc )
@@ -231,6 +236,7 @@ namespace toolkit
}
}
}
+#endif // HAVE_FEATURE_DESKTOP
if ( !s_pFactory.get() )
// the attempt to load the lib, or to create the factory, failed
@@ -276,5 +282,4 @@ namespace toolkit
} // namespace toolkit
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ba419888d0de6b31f598f2faa9cca1e1f75a53fa
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 18 19:30:03 2014 +0200
accessibility: Move AccessibleFactory to anonymous namespace.
Change-Id: I19a9e0a9f8b15936ee5e7da5d64d39a6c7adc793
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 1bbaa62..d29a7a7 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -63,8 +63,14 @@
#include "floatingwindowaccessible.hxx"
-namespace accessibility
-{
+using namespace ::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+using namespace ::svt::table;
+
+namespace {
inline bool hasFloatingChild(Window *pWindow)
{
@@ -75,426 +81,419 @@ inline bool hasFloatingChild(Window *pWindow)
return false;
}
+// IAccessibleFactory
+class AccessibleFactory :public ::toolkit::IAccessibleFactory
+ ,public ::svt::IAccessibleFactory
+{
+private:
+ oslInterlockedCount m_refCount;
+
+public:
+ AccessibleFactory();
+
+ // IReference
+ virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
+ virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
+
+ // ::toolkit::IAccessibleFactory
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXButton* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXCheckBox* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXRadioButton* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXListBox* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXFixedText* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXFixedHyperlink* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXScrollBar* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXEdit* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXComboBox* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXToolBox* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleContext( VCLXWindow* _pXWindow ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar ) SAL_OVERRIDE;
+
+ // ::svt::IAccessibleFactory
+ virtual IAccessibleTabListBox*
+ createAccessibleTabListBox(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+ SvHeaderTabListBox& rBox
+ ) const SAL_OVERRIDE;
+
+ virtual IAccessibleBrowseBox*
+ createAccessibleBrowseBox(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ IAccessibleTableProvider& _rBrowseBox
+ ) const SAL_OVERRIDE;
+
+ virtual IAccessibleTableControl*
+ createAccessibleTableControl(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ IAccessibleTable& _rTable
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleIconChoiceCtrl(
+ SvtIconChoiceCtrl& _rIconCtrl,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleTabBar(
+ TabBar& _rTabBar
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleTextWindowContext(
+ VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleTreeListBox(
+ SvTreeListBox& _rListBox,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleBrowseBoxHeaderBar(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+ IAccessibleTableProvider& _rOwningTable,
+ AccessibleBrowseBoxObjType _eObjType
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleBrowseBoxTableCell(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ IAccessibleTableProvider& _rBrowseBox,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+ sal_Int32 _nRowId,
+ sal_uInt16 _nColId,
+ sal_Int32 _nOffset
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleBrowseBoxHeaderCell(
+ sal_Int32 _nColumnRowId,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+ IAccessibleTableProvider& _rBrowseBox,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+ AccessibleBrowseBoxObjType _eObjType
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createAccessibleCheckBoxCell(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ IAccessibleTableProvider& _rBrowseBox,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+ sal_Int32 _nRowPos,
+ sal_uInt16 _nColPos,
+ const TriState& _eState,
+ bool _bIsTriState
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ createEditBrowseBoxTableCellAccess(
+ const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent,
+ const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxControlAccessible,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _rxFocusWindow,
+ IAccessibleTableProvider& _rBrowseBox,
+ sal_Int32 _nRowPos,
+ sal_uInt16 _nColPos
+ ) const SAL_OVERRIDE;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleToolPanelDeck(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+ ::svt::ToolPanelDeck& i_rPanelDeck
+ ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ createAccessibleToolPanelTabBar(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+ ::svt::IToolPanelDeck& i_rPanelDeck,
+ ::svt::PanelTabBar& i_rTabBar
+ ) SAL_OVERRIDE;
+
+protected:
+ virtual ~AccessibleFactory();
+};
+
+AccessibleFactory::AccessibleFactory()
+ :m_refCount( 0 )
+{
+}
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::awt;
- using namespace ::com::sun::star::accessibility;
- using namespace ::svt;
- using namespace ::svt::table;
-
- // IAccessibleFactory
- class AccessibleFactory :public ::toolkit::IAccessibleFactory
- ,public ::svt::IAccessibleFactory
- {
- private:
- oslInterlockedCount m_refCount;
-
- public:
- AccessibleFactory();
-
- // IReference
- virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
- virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
- // ::toolkit::IAccessibleFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXButton* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXCheckBox* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXRadioButton* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXListBox* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXFixedText* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXFixedHyperlink* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXScrollBar* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXEdit* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXComboBox* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXToolBox* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleContext( VCLXWindow* _pXWindow ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar ) SAL_OVERRIDE;
-
- // ::svt::IAccessibleFactory
- virtual IAccessibleTabListBox*
- createAccessibleTabListBox(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
- SvHeaderTabListBox& rBox
- ) const SAL_OVERRIDE;
-
- virtual IAccessibleBrowseBox*
- createAccessibleBrowseBox(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
- IAccessibleTableProvider& _rBrowseBox
- ) const SAL_OVERRIDE;
-
- virtual IAccessibleTableControl*
- createAccessibleTableControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
- IAccessibleTable& _rTable
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleIconChoiceCtrl(
- SvtIconChoiceCtrl& _rIconCtrl,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleTabBar(
- TabBar& _rTabBar
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleTextWindowContext(
- VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleTreeListBox(
- SvTreeListBox& _rListBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleBrowseBoxHeaderBar(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
- IAccessibleTableProvider& _rOwningTable,
- AccessibleBrowseBoxObjType _eObjType
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleBrowseBoxTableCell(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
- IAccessibleTableProvider& _rBrowseBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
- sal_Int32 _nRowId,
- sal_uInt16 _nColId,
- sal_Int32 _nOffset
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleBrowseBoxHeaderCell(
- sal_Int32 _nColumnRowId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
- IAccessibleTableProvider& _rBrowseBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
- AccessibleBrowseBoxObjType _eObjType
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createAccessibleCheckBoxCell(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
- IAccessibleTableProvider& _rBrowseBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
- sal_Int32 _nRowPos,
- sal_uInt16 _nColPos,
- const TriState& _eState,
- bool _bIsTriState
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- createEditBrowseBoxTableCellAccess(
- const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent,
- const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxControlAccessible,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _rxFocusWindow,
- IAccessibleTableProvider& _rBrowseBox,
- sal_Int32 _nRowPos,
- sal_uInt16 _nColPos
- ) const SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleToolPanelDeck(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
- ::svt::ToolPanelDeck& i_rPanelDeck
- ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- createAccessibleToolPanelTabBar(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
- ::svt::IToolPanelDeck& i_rPanelDeck,
- ::svt::PanelTabBar& i_rTabBar
- ) SAL_OVERRIDE;
-
- protected:
- virtual ~AccessibleFactory();
- };
-
- AccessibleFactory::AccessibleFactory()
- :m_refCount( 0 )
- {
- }
+AccessibleFactory::~AccessibleFactory()
+{
+}
- AccessibleFactory::~AccessibleFactory()
- {
- }
+oslInterlockedCount SAL_CALL AccessibleFactory::acquire()
+{
+ return osl_atomic_increment( &m_refCount );
+}
- oslInterlockedCount SAL_CALL AccessibleFactory::acquire()
+oslInterlockedCount SAL_CALL AccessibleFactory::release()
+{
+ if ( 0 == osl_atomic_decrement( &m_refCount ) )
{
- return osl_atomic_increment( &m_refCount );
+ delete this;
+ return 0;
}
- oslInterlockedCount SAL_CALL AccessibleFactory::release()
- {
- if ( 0 == osl_atomic_decrement( &m_refCount ) )
- {
- delete this;
- return 0;
- }
-
- return m_refCount;
- }
-
- Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar )
- {
- OAccessibleMenuBaseComponent* pAccessible;
- if ( _bIsMenuBar )
- pAccessible = new VCLXAccessibleMenuBar( _pMenu );
- else
- pAccessible = new VCLXAccessiblePopupMenu( _pMenu );
- pAccessible->SetStates();
- return pAccessible;
- }
+ return m_refCount;
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXButton* _pXWindow )
- {
- return new VCLXAccessibleButton( _pXWindow );
- }
+Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar )
+{
+ OAccessibleMenuBaseComponent* pAccessible;
+ if ( _bIsMenuBar )
+ pAccessible = new VCLXAccessibleMenuBar( _pMenu );
+ else
+ pAccessible = new VCLXAccessiblePopupMenu( _pMenu );
+ pAccessible->SetStates();
+ return pAccessible;
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXCheckBox* _pXWindow )
- {
- return new VCLXAccessibleCheckBox( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXButton* _pXWindow )
+{
+ return new VCLXAccessibleButton( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXRadioButton* _pXWindow )
- {
- return new VCLXAccessibleRadioButton( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXCheckBox* _pXWindow )
+{
+ return new VCLXAccessibleCheckBox( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXListBox* _pXWindow )
- {
- bool bIsDropDownBox = false;
- ListBox* pBox = static_cast< ListBox* >( _pXWindow->GetWindow() );
- if ( pBox )
- bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN );
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXRadioButton* _pXWindow )
+{
+ return new VCLXAccessibleRadioButton( _pXWindow );
+}
- if ( bIsDropDownBox )
- return new VCLXAccessibleDropDownListBox( _pXWindow );
- else
- return new VCLXAccessibleListBox( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXListBox* _pXWindow )
+{
+ bool bIsDropDownBox = false;
+ ListBox* pBox = static_cast< ListBox* >( _pXWindow->GetWindow() );
+ if ( pBox )
+ bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN );
+
+ if ( bIsDropDownBox )
+ return new VCLXAccessibleDropDownListBox( _pXWindow );
+ else
+ return new VCLXAccessibleListBox( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedText* _pXWindow )
- {
- return new VCLXAccessibleFixedText( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedText* _pXWindow )
+{
+ return new VCLXAccessibleFixedText( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedHyperlink* _pXWindow )
- {
- return new VCLXAccessibleFixedHyperlink( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedHyperlink* _pXWindow )
+{
+ return new VCLXAccessibleFixedHyperlink( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXScrollBar* _pXWindow )
- {
- return new VCLXAccessibleScrollBar( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXScrollBar* _pXWindow )
+{
+ return new VCLXAccessibleScrollBar( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXEdit* _pXWindow )
- {
- return new VCLXAccessibleEdit( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXEdit* _pXWindow )
+{
+ return new VCLXAccessibleEdit( _pXWindow );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXComboBox* _pXWindow )
- {
- bool bIsDropDownBox = false;
- ComboBox* pBox = static_cast< ComboBox* >( _pXWindow->GetWindow() );
- if ( pBox )
- bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN );
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXComboBox* _pXWindow )
+{
+ bool bIsDropDownBox = false;
+ ComboBox* pBox = static_cast< ComboBox* >( _pXWindow->GetWindow() );
+ if ( pBox )
+ bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN );
+
+ if ( bIsDropDownBox )
+ return new VCLXAccessibleDropDownComboBox( _pXWindow );
+ else
+ return new VCLXAccessibleComboBox( _pXWindow );
+}
- if ( bIsDropDownBox )
- return new VCLXAccessibleDropDownComboBox( _pXWindow );
- else
- return new VCLXAccessibleComboBox( _pXWindow );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXWindow* _pXWindow )
+{
+ Reference< XAccessibleContext > xContext;
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXWindow* _pXWindow )
+ Window* pWindow = _pXWindow->GetWindow();
+ if ( pWindow )
{
- Reference< XAccessibleContext > xContext;
+ WindowType nType = pWindow->GetType();
- Window* pWindow = _pXWindow->GetWindow();
- if ( pWindow )
+ if ( nType == WINDOW_MENUBARWINDOW || pWindow->IsMenuFloatingWindow() || pWindow->IsToolbarFloatingWindow() )
{
- WindowType nType = pWindow->GetType();
-
- if ( nType == WINDOW_MENUBARWINDOW || pWindow->IsMenuFloatingWindow() || pWindow->IsToolbarFloatingWindow() )
+ Reference< XAccessible > xAcc( pWindow->GetAccessible() );
+ if ( xAcc.is() )
{
- Reference< XAccessible > xAcc( pWindow->GetAccessible() );
- if ( xAcc.is() )
+ Reference< XAccessibleContext > xCont( xAcc->getAccessibleContext() );
+ if ( pWindow->GetType() == WINDOW_MENUBARWINDOW ||
+ ( xCont.is() && xCont->getAccessibleRole() == AccessibleRole::POPUP_MENU ) )
{
- Reference< XAccessibleContext > xCont( xAcc->getAccessibleContext() );
- if ( pWindow->GetType() == WINDOW_MENUBARWINDOW ||
- ( xCont.is() && xCont->getAccessibleRole() == AccessibleRole::POPUP_MENU ) )
- {
- xContext = xCont;
- }
+ xContext = xCont;
}
}
+ }
- else if ( nType == WINDOW_STATUSBAR )
- {
- xContext = (XAccessibleContext*) new VCLXAccessibleStatusBar( _pXWindow );
- }
-
- else if ( nType == WINDOW_TABCONTROL )
- {
- xContext = (XAccessibleContext*) new VCLXAccessibleTabControl( _pXWindow );
- }
+ else if ( nType == WINDOW_STATUSBAR )
+ {
+ xContext = (XAccessibleContext*) new VCLXAccessibleStatusBar( _pXWindow );
+ }
- else if ( nType == WINDOW_TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WINDOW_TABCONTROL )
- {
- xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
- }
+ else if ( nType == WINDOW_TABCONTROL )
+ {
+ xContext = (XAccessibleContext*) new VCLXAccessibleTabControl( _pXWindow );
+ }
- else if ( nType == WINDOW_FLOATINGWINDOW )
- {
- xContext = new FloatingWindowAccessible( _pXWindow );
- }
+ else if ( nType == WINDOW_TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WINDOW_TABCONTROL )
+ {
+ xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
+ }
- else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
- {
- // The logic here has to match that of Window::GetAccessibleParentWindow in
- // vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow
- // becoming a11y parents of themselves
- Window* pChild = pWindow->GetAccessibleChildWindow(0);
- if (PopupMenuFloatingWindow::isPopupMenu(pChild))
- {
- // Get the accessible context from the child window.
- Reference<XAccessible> xAccessible = pChild->CreateAccessible();
- if (xAccessible.is())
- xContext = xAccessible->getAccessibleContext();
- }
- else
- xContext = new FloatingWindowAccessible( _pXWindow );
- }
+ else if ( nType == WINDOW_FLOATINGWINDOW )
+ {
+ xContext = new FloatingWindowAccessible( _pXWindow );
+ }
- else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) )
+ else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
+ {
+ // The logic here has to match that of Window::GetAccessibleParentWindow in
+ // vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow
+ // becoming a11y parents of themselves
+ Window* pChild = pWindow->GetAccessibleChildWindow(0);
+ if (PopupMenuFloatingWindow::isPopupMenu(pChild))
{
- xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );
+ // Get the accessible context from the child window.
+ Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+ if (xAccessible.is())
+ xContext = xAccessible->getAccessibleContext();
}
else
- {
- xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleComponent( _pXWindow );
- }
+ xContext = new FloatingWindowAccessible( _pXWindow );
}
- return xContext;
- }
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXToolBox* _pXWindow )
- {
- return new VCLXAccessibleToolBox( _pXWindow );
+ else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) )
+ {
+ xContext = (XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );
+ }
+ else
+ {
+ xContext = (XAccessibleContext*) new VCLXAccessibleComponent( _pXWindow );
+ }
}
+ return xContext;
+}
- IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox(
- const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const
- {
- return new AccessibleTabListBox( rxParent, rBox );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXToolBox* _pXWindow )
+{
+ return new VCLXAccessibleToolBox( _pXWindow );
+}
- IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
- const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const
- {
- return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox );
- }
+IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox(
+ const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const
+{
+ return new AccessibleTabListBox( rxParent, rBox );
+}
- IAccessibleTableControl* AccessibleFactory::createAccessibleTableControl(
- const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) const
- {
- return new AccessibleGridControlAccess( _rxParent, _rTable );
- }
+IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
+ const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const
+{
+ return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl(
- SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) const
- {
- return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent );
- }
+IAccessibleTableControl* AccessibleFactory::createAccessibleTableControl(
+ const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) const
+{
+ return new AccessibleGridControlAccess( _rxParent, _rTable );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const
- {
- return new AccessibleTabBar( &_rTabBar );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl(
+ SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) const
+{
+ return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
- VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const
- {
- return new Document( pVclXWindow, rEngine, rView );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const
+{
+ return new AccessibleTabBar( &_rTabBar );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
- SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const
- {
- return new AccessibleListBox( _rListBox, _xParent );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
+ VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const
+{
+ return new Document( pVclXWindow, rEngine, rView );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
- const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable,
- AccessibleBrowseBoxObjType _eObjType ) const
- {
- return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
+ SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const
+{
+ return new AccessibleListBox( _rListBox, _xParent );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
- const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
- const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const
- {
- return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow,
- _nRowId, _nColId, _nOffset );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
+ const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable,
+ AccessibleBrowseBoxObjType _eObjType ) const
+{
+ return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell(
- sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox,
- const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const
- {
- return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox,
- _xFocusWindow, _eObjType );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
+ const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
+ const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const
+{
+ return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow,
+ _nRowId, _nColId, _nOffset );
+}
- Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
- const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
- const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos,
- const TriState& _eState, bool _bIsTriState ) const
- {
- return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _xFocusWindow,
- _nRowPos, _nColPos, _eState, _bIsTriState );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell(
+ sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox,
+ const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const
+{
+ return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox,
+ _xFocusWindow, _eObjType );
+}
- Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess(
- const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible,
- const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox,
- sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const
- {
- return new EditBrowseBoxTableCellAccess( _rxParent, _rxControlAccessible,
- _rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos );
- }
+Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
+ const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
+ const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos,
+ const TriState& _eState, bool _bIsTriState ) const
+{
+ return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _xFocusWindow,
+ _nRowPos, _nColPos, _eState, _bIsTriState );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelDeck(
- const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck )
- {
- return new AccessibleToolPanelDeck( i_rAccessibleParent, i_rPanelDeck );
- }
+Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess(
+ const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible,
+ const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox,
+ sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const
+{
+ return new EditBrowseBoxTableCellAccess( _rxParent, _rxControlAccessible,
+ _rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos );
+}
- Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabBar(
- const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
- {
- return new AccessibleToolPanelTabBar( i_rAccessibleParent, i_rPanelDeck, i_rTabBar );
- }
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelDeck(
+ const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck )
+{
+ return new AccessibleToolPanelDeck( i_rAccessibleParent, i_rPanelDeck );
+}
+
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabBar(
+ const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
+{
+ return new AccessibleToolPanelTabBar( i_rAccessibleParent, i_rPanelDeck, i_rTabBar );
+}
-} // namespace accessibility
+} // anonymous namespace
/* this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
by this library
@@ -506,7 +505,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL getStandardAccessibleFactory()
{
- ::toolkit::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
+ ::toolkit::IAccessibleFactory* pFactory = new AccessibleFactory;
pFactory->acquire();
return pFactory;
}
@@ -523,7 +522,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL getSvtAccessibilityComponentFactory()
{
- ::svt::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
+ ::svt::IAccessibleFactory* pFactory = new AccessibleFactory;
pFactory->acquire();
return pFactory;
}
commit 1d93b5d125dc2889c813835332c462861ebeb26c
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 18 18:35:58 2014 +0200
No need for the extra levels here.
Change-Id: I6e408fad50c907094431138adc74e59514885912
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index c744ffc..c4334cd 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1001,87 +1001,79 @@ Document::retrieveCharacterAttributes(
const sal_Int32 AttributeCount = 9;
sal_Int32 i = 0;
::css::uno::Sequence< ::css::beans::PropertyValue > aAttribs( AttributeCount );
+
//character background color
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharBackColor"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = mapFontColor( aFont.GetFillColor() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharBackColor";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = mapFontColor( aFont.GetFillColor() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character color
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor"));
- aAttribs[i].Handle = -1;
- //aAttribs[i].Value = mapFontColor( aFont.GetColor() );
- aAttribs[i].Value = mapFontColor( m_rEngine.GetTextColor() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharColor";
+ aAttribs[i].Handle = -1;
+ //aAttribs[i].Value = mapFontColor( aFont.GetColor() );
+ aAttribs[i].Value = mapFontColor( m_rEngine.GetTextColor() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character font name
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontName"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (::rtl::OUString)aFont.GetName() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharFontName";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (::rtl::OUString)aFont.GetName() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character height
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetHeight() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharHeight";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetHeight() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character posture
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetItalic() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharPosture";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetItalic() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character relief
- /*{
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRelief"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetRelief() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }*/
+ /*
+ aAttribs[i].Name = "CharRelief";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetRelief() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+ */
+
//character strikeout
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetStrikeout() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharStrikeout";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetStrikeout() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character underline
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetUnderline() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharUnderline";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetUnderline() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character weight
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (float)aFont.GetWeight() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "CharWeight";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (float)aFont.GetWeight() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
+
//character alignment
- {
- aAttribs[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAdjust"));
- aAttribs[i].Handle = -1;
- aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)m_rEngine.GetTextAlign() );
- aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
- i++;
- }
+ aAttribs[i].Name = "ParaAdjust";
+ aAttribs[i].Handle = -1;
+ aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)m_rEngine.GetTextAlign() );
+ aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE;
+ i++;
::osl::MutexGuard aInternalGuard(GetMutex());
::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
commit 29d5ce2d88732c12c986d3b7991897043a7be576
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 18 18:04:32 2014 +0200
sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.
Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index baf7a48..4921e70 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -53,6 +53,12 @@ public:
using SotObject::GetInterface;
SFX_DECL_OBJECTFACTORY();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
+
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
DocShell();
virtual ~DocShell();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index fa5d4c6..97d1ac8 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -152,6 +152,11 @@ public:
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_VIEWSH )
SFX_DECL_VIEWFACTORY(Shell);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
Shell( SfxViewFrame *pFrame, SfxViewShell *pOldSh );
virtual ~Shell();
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index b628e95..17b80b9 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -140,6 +140,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+
SfxApplication();
virtual ~SfxApplication();
static SfxApplication* GetOrCreate();
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index a12bd16..9dbfbad 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -69,6 +69,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+
SfxModule( ResMgr* pMgrP, bool bDummy,
SfxObjectFactory* pFactoryP, ... );
virtual ~SfxModule();
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 84757d4..79082aa 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -206,6 +206,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
/* Stampit disable/enable cancel button for print jobs
default = true = enable! */
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 3a8c5d8..7047e4d 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -300,9 +300,6 @@ inline void SfxShell::SetPool
#define SFX_DECL_INTERFACE(nId) \
static SfxInterface* pInterface; \
- private: \
- static void InitInterface_Impl(); \
- public: \
static const SfxFormalArgument* pSfxFormalArgs_Impl; \
static SfxInterface* GetStaticInterface(); \
static SfxInterfaceId GetInterfaceId() {return SfxInterfaceId(nId);} \
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 86e6f0c..09ec9b5 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -91,6 +91,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+
static void SetViewFrame( SfxViewFrame* );
static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index e95377b..a8c3c32 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -165,6 +165,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+
SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 );
virtual ~SfxViewShell();
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index fd1effa..921c1a2 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -41,7 +41,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR)
- ExtrusionBar(SfxViewShell* pViewShell );
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ExtrusionBar(SfxViewShell* pViewShell);
virtual ~ExtrusionBar();
static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings );
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 222c71f..b733b25 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -103,6 +103,11 @@ public:
SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
FmFormShell(SfxViewShell* pParent, FmFormView* pView = NULL);
virtual ~FmFormShell();
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 2ca04ca..f3f06b7 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -41,7 +41,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR)
- FontworkBar(SfxViewShell* pViewShell );
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ FontworkBar(SfxViewShell* pViewShell);
virtual ~FontworkBar();
static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings );
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index f15ea33..db68ba76 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -116,6 +116,11 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
public:
SFX_DECL_INTERFACE(SCID_APP)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ScModule( SfxObjectFactory* pFact );
virtual ~ScModule();
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index 3efcc6b..6a902d6 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -31,17 +31,22 @@ class ScAuditingShell : public SfxShell
{
private:
ScViewData* pViewData;
- sal_uInt16 nFunction;
+ sal_uInt16 nFunction;
public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_AUDITING_SHELL)
- ScAuditingShell(ScViewData* pData);
- virtual ~ScAuditingShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScAuditingShell(ScViewData* pData);
+ virtual ~ScAuditingShell();
- void Execute(SfxRequest& rReq);
- void GetState(SfxItemSet& rSet);
+ void Execute(SfxRequest& rReq);
+ void GetState(SfxItemSet& rSet);
};
#endif
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index bcfbed1..b6ad427 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -67,10 +67,14 @@ private:
RotateTransliteration m_aRotateCase;
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_CELL_SHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ScCellShell(ScViewData* pData);
virtual ~ScCellShell();
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index 947e616..5466cb24 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -31,17 +31,21 @@ class ScViewData;
class ScChartShell: public ScDrawShell
{
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_CHART_SHELL)
- ScChartShell(ScViewData* pData);
- virtual ~ScChartShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScChartShell(ScViewData* pData);
+ virtual ~ScChartShell();
- void ExecuteExportAsGraphic(SfxRequest& rReq);
- void GetExportAsGraphicState(SfxItemSet &rSet);
+ void ExecuteExportAsGraphic(SfxRequest& rReq);
+ void GetExportAsGraphicState(SfxItemSet &rSet);
- virtual void HandleSelectionChange (void);
+ virtual void HandleSelectionChange(void);
};
#endif
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 60c2657..3a85c3c 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -170,10 +170,14 @@ protected:
public:
TYPEINFO_OVERRIDE();
-
SFX_DECL_INTERFACE(SCID_DOC_SHELL)
SFX_DECL_OBJECTFACTORY();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ScDocShell( const ScDocShell& rDocShell );
ScDocShell( const sal_uInt64 i_nSfxCreationFlags = SFXMODEL_EMBEDDED_OBJECT );
virtual ~ScDocShell();
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 166a40f..023a5a2 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -51,6 +51,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_DRAW_SHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ScDrawShell(ScViewData* pData);
virtual ~ScDrawShell();
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 599906d..464a6bd 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -27,18 +27,21 @@
class ScViewData;
-
#include "drawsh.hxx"
class ScDrawFormShell: public ScDrawShell
{
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_FORM_SHELL)
- ScDrawFormShell(ScViewData* pData);
- virtual ~ScDrawFormShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScDrawFormShell(ScViewData* pData);
+ virtual ~ScDrawFormShell();
};
#endif
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index 1930a23..0dcba5f 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -44,8 +44,13 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL)
- ScDrawTextObjectBar(ScViewData* pData);
- virtual ~ScDrawTextObjectBar();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScDrawTextObjectBar(ScViewData* pData);
+ virtual ~ScDrawTextObjectBar();
void StateDisableItems( SfxItemSet &rSet );
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index d77d991..26c55af 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -52,8 +52,13 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_EDIT_SHELL)
- ScEditShell(EditView* pView, ScViewData* pData);
- virtual ~ScEditShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScEditShell(EditView* pView, ScViewData* pData);
+ virtual ~ScEditShell();
void SetEditView(EditView* pView);
EditView* GetEditView() {return pEditView;}
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index 13b004f..5be26e7 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -32,15 +32,18 @@ class ScFormatShell: public SfxShell
ScViewData* pViewData;
protected:
-
ScViewData* GetViewData(){return pViewData;}
const ScViewData* GetViewData() const {return pViewData;}
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_FORMAT_SHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ScFormatShell(ScViewData* pData);
virtual ~ScFormatShell();
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index a00b24e..35d43d0 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -32,12 +32,16 @@ class ScViewData;
class ScGraphicShell: public ScDrawShell
{
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL)
- ScGraphicShell(ScViewData* pData);
- virtual ~ScGraphicShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScGraphicShell(ScViewData* pData);
+ virtual ~ScGraphicShell();
void Execute(SfxRequest& rReq);
void GetAttrState(SfxItemSet &rSet);
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index eb32925..d02b1c3 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -32,15 +32,19 @@ class ScViewData;
class ScMediaShell: public ScDrawShell
{
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_MEDIA_SHELL)
- ScMediaShell(ScViewData* pData);
- virtual ~ScMediaShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScMediaShell(ScViewData* pData);
+ virtual ~ScMediaShell();
- void ExecuteMedia(SfxRequest& rReq);
- void GetMediaState(SfxItemSet &rSet);
+ void ExecuteMedia(SfxRequest& rReq);
+ void GetMediaState(SfxItemSet &rSet);
};
#endif
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index f82e562..6adfc6f 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -32,14 +32,18 @@ class ScViewData;
class ScOleObjectShell: public ScDrawShell
{
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL)
- ScOleObjectShell(ScViewData* pData);
- virtual ~ScOleObjectShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScOleObjectShell(ScViewData* pData);
+ virtual ~ScOleObjectShell();
- virtual void HandleSelectionChange (void);
+ virtual void HandleSelectionChange();
};
#endif
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index 3718cbc..5db4da5 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -33,12 +33,16 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_PAGEBREAK_SHELL)
- ScPageBreakShell( ScTabViewShell* pView );
- virtual ~ScPageBreakShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScPageBreakShell(ScTabViewShell* pView);
+ virtual ~ScPageBreakShell();
};
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index d52259f..a610aa5 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -34,11 +34,16 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_PIVOT_SHELL)
- ScPivotShell( ScTabViewShell* pView );
- virtual ~ScPivotShell();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ ScPivotShell(ScTabViewShell* pView);
+ virtual ~ScPivotShell();
- void Execute ( SfxRequest& rReq );
- void GetState( SfxItemSet& rSet );
+ void Execute(SfxRequest& rReq);
+ void GetState(SfxItemSet& rSet);
private:
ScTabViewShell* pViewShell;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 851824d..3f5a734 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -79,10 +79,14 @@ protected:
public:
TYPEINFO_VISIBILITY( SC_DLLPUBLIC );
-
SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScPreviewShell);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ScPreviewShell( SfxViewFrame* pViewFrame,
SfxViewShell* pOldSh );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index bd5f0a2..a4aa81a 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -230,11 +230,14 @@ protected:
public:
TYPEINFO_VISIBILITY(SC_DLLPUBLIC);
-
SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScTabViewShell);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+public:
/** -> Clone Method for Factory
Created from a general shell and inherit as much as possible */
ScTabViewShell( SfxViewFrame* pViewFrame,
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 10c7fde..5a5450d 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -73,11 +73,15 @@ enum SdOptionStreamMode
class SdModule : public SfxModule, public SfxListener
{
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDAPP)
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SdModule(SfxObjectFactory* pDrawObjFact, SfxObjectFactory* pGraphicObjFact);
virtual ~SdModule();
diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx
index 11036a2..07ca754 100644
--- a/sd/source/ui/inc/BezierObjectBar.hxx
+++ b/sd/source/ui/inc/BezierObjectBar.hxx
@@ -36,8 +36,13 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR)
- BezierObjectBar (ViewShell* pSdViewShell, View* pSdView);
- virtual ~BezierObjectBar (void);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ BezierObjectBar(ViewShell* pSdViewShell, View* pSdView);
+ virtual ~BezierObjectBar();
void GetAttrState(SfxItemSet& rSet);
void Execute(SfxRequest &rReq);
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index b34f7d4..7f12524 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -44,7 +44,6 @@ namespace sd {
class FrameView;
class ViewShell;
-
// DrawDocShell
class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell
{
@@ -53,6 +52,11 @@ public:
SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL)
SFX_DECL_OBJECTFACTORY();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
DrawDocShell (
SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED,
sal_Bool bSdDataObj=sal_False,
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 2e873a2..57d8301 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -66,9 +66,13 @@ public:
static const int SLOTARRAY_COUNT = 24;
TYPEINFO_OVERRIDE();
-
SFX_DECL_INTERFACE(SD_IF_SDDRAWVIEWSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
/** Create a new stackable shell that may take some information
(e.g. the frame view) from the given previous shell.
@param ePageKind
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index fc3c860..5808493 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -37,8 +37,13 @@ class GraphicDocShell
{
public:
TYPEINFO_OVERRIDE();
-
SFX_DECL_INTERFACE(SD_IF_SDGRAPHICDOCSHELL)
+
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SFX_DECL_OBJECTFACTORY();
using SotObject::GetInterface;
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index 3f28c15..bd0f580 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -29,7 +29,6 @@ namespace sd {
class View;
class ViewShell;
-
class GraphicObjectBar
: public SfxShell
{
@@ -37,6 +36,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR )
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
virtual ~GraphicObjectBar (void);
@@ -50,7 +54,6 @@ protected:
::sd::View* mpView;
ViewShell* mpViewSh;
sal_uInt16 nMappedSlotFilter;
-
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index f09d274..632a31e 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -44,6 +44,11 @@ public:
SFX_DECL_VIEWFACTORY(GraphicViewShell);
SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
/** Create a new view shell for the Draw application.
@param rViewShellBase
The new object will be stacked on this view shell base.
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index 863deb6..00be1fb 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -29,7 +29,6 @@ namespace sd {
class View;
class ViewShell;
-
class MediaObjectBar
: public SfxShell
{
@@ -37,6 +36,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR )
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+
MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
virtual ~MediaObjectBar (void);
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 0897f2d..141a1881 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -41,8 +41,10 @@ public:
SFX_DECL_VIEWFACTORY(OutlineViewShell);
SFX_DECL_INTERFACE(SD_IF_SDOUTLINEVIEWSHELL)
- // The previous macros change access mode. To be sure switch back
- // to public access.
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
public:
/** Create a new view shell for the outline mode.
@param rViewShellBase
diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx
index 0dd1c55..151a0a7 100644
--- a/sd/source/ui/inc/PaneShells.hxx
+++ b/sd/source/ui/inc/PaneShells.hxx
@@ -27,7 +27,6 @@
namespace sd {
-
/** Shell that displays the left pane for Impress. The shell does not do
anything else and has especially no slots.
*/
@@ -38,13 +37,15 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDLEFTIMPRESSPANESHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
LeftImpressPaneShell (void);
virtual ~LeftImpressPaneShell (void);
};
-
-
-
/** Shell that displays the left pane for Draw. The shell does not do
anything else and has especially no slots.
*/
@@ -55,13 +56,15 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDLEFTDRAWPANESHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
LeftDrawPaneShell (void);
virtual ~LeftDrawPaneShell (void);
};
-
-
-
/** Shell that displays the right pane for both Impress and Draw. The shell
does not do anything else and has especially no slots.
*/
@@ -71,6 +74,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL )
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ToolPanelPaneShell();
virtual ~ToolPanelPaneShell();
};
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index 0352565..75a64ce 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -35,6 +35,11 @@ public:
SFX_DECL_VIEWFACTORY(PresViewShell);
SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL )
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL);
virtual ~PresentationViewShell (void);
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 66cdebe..238e1a5 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -31,7 +31,6 @@ namespace sd { namespace slidesorter { namespace controller {
class SlotManager;
} } }
-
namespace sd { namespace slidesorter {
class SlideSorter;
@@ -45,6 +44,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
static ::boost::shared_ptr<SlideSorterViewShell> Create(
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx
index 6d760dc..17388f1 100644
--- a/sd/source/ui/inc/TextObjectBar.hxx
+++ b/sd/source/ui/inc/TextObjectBar.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_TEXTOBJECTBAR_HXX
#define INCLUDED_SD_SOURCE_UI_INC_TEXTOBJECTBAR_HXX
-
#include <sfx2/module.hxx>
#include <sfx2/shell.hxx>
#include "glob.hxx"
@@ -39,6 +38,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
TextObjectBar (
ViewShell* pSdViewShell,
SfxItemPool& rItemPool,
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 02aaa22..e693e61 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -66,6 +66,11 @@ public:
SFX_DECL_VIEWFACTORY(ViewShellBase);
SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
/** This constructor is used by the view factory of the SFX macros.
Note that LateInit() has to be called after the constructor
terminates and before doing anything else.
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 3830f5b..329219e 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -58,6 +58,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
ToolPanelViewShell (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
@@ -134,7 +139,6 @@ private:
*/
::std::auto_ptr<PopupMenu> CreatePopupMenu (bool bIsDocking);
-
/** Initialize the task pane view shell if that has not yet been done
before. If mbIsInitialized is already set to <TRUE/> then this
method returns immediately.
@@ -142,9 +146,6 @@ private:
void Initialize (void);
};
-
-
-
} } // end of namespace ::sd::toolpanel
#endif
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 4bbdf99..b62a4f6 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -39,6 +39,12 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDDRAWTABLEOBJECTBAR )
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+
TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView);
virtual ~TableObjectBar (void);
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 25b9079..b1f0aa2 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -46,7 +46,6 @@
#include <map>
-
// Maps the Which() field to a pointer to a SfxPoolItem
class SfxItemPtrMap : public std::map<sal_uInt16, SfxPoolItem*>
{
@@ -60,7 +59,6 @@ public:
TYPEINIT0(SfxShell);
-
class SfxVerbSlotArr_Impl : public std::vector<SfxSlot*>
{
public:
@@ -73,7 +71,6 @@ public:
using namespace com::sun::star;
-
// SfxShell_Impl
struct SfxShell_Impl: public SfxBroadcaster
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index a325201..eba196d 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -156,9 +156,15 @@ class SmDocShell : public SfxObjectShell, public SfxListener
public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+1)
+
using SotObject::GetInterface;
SFX_DECL_OBJECTFACTORY();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SmDocShell( const sal_uInt64 i_nSfxCreationFlags );
virtual ~SmDocShell();
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index aa35406..b3af03d 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -84,8 +84,6 @@ public:
const OUString GetExportSymbolSetName( const OUString &rUiName ) const;
};
-
-
class SmModule : public SfxModule, utl::ConfigurationListener
{
svtools::ColorConfig *pColorConfig;
@@ -103,6 +101,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START + 0)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SmModule(SfxObjectFactory* pObjFact);
virtual ~SmModule();
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 1f35a4b..9c79806 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -298,6 +298,11 @@ public:
SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+2)
SFX_DECL_VIEWFACTORY(SmViewShell);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
virtual void Execute( SfxRequest& rReq );
virtual void GetState(SfxItemSet &);
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 179744a..278991c 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -151,6 +151,11 @@ public:
SFX_DECL_OBJECTFACTORY()
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
static SfxInterface *_GetInterface() { return GetStaticInterface(); }
static OUString GetEventName( sal_Int32 nId );
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index ba4198a..6217890 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -124,6 +124,11 @@ public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
// This Ctor only for SW-Dll.
SwModule( SfxObjectFactory* pFact,
SfxObjectFactory* pWebFact,
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index bd0e802..015ec98 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -27,7 +27,6 @@ class SW_DLLPUBLIC SwWebDocShell: public SwDocShell
sal_uInt16 nSourcePara; // Active line in source view.
public:
-
using SotObject::GetInterface;
// But implement yourself.
@@ -35,6 +34,11 @@ public:
SFX_DECL_OBJECTFACTORY();
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
virtual ~SwWebDocShell();
diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
index 02fe9f3..3858103 100644
--- a/sw/source/core/uibase/inc/annotsh.hxx
+++ b/sw/source/core/uibase/inc/annotsh.hxx
@@ -34,6 +34,11 @@ public:
SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwAnnotationShell(SwView&);
virtual ~SwAnnotationShell();
diff --git a/sw/source/core/uibase/inc/basesh.hxx b/sw/source/core/uibase/inc/basesh.hxx
index 5bbdb89..a145bbb 100644
--- a/sw/source/core/uibase/inc/basesh.hxx
+++ b/sw/source/core/uibase/inc/basesh.hxx
@@ -71,6 +71,11 @@ public:
SFX_DECL_INTERFACE(SW_BASESHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
void ExecDelete(SfxRequest &);
void ExecClpbrd(SfxRequest &);
diff --git a/sw/source/core/uibase/inc/beziersh.hxx b/sw/source/core/uibase/inc/beziersh.hxx
index 458ba45..841440c 100644
--- a/sw/source/core/uibase/inc/beziersh.hxx
+++ b/sw/source/core/uibase/inc/beziersh.hxx
@@ -27,6 +27,11 @@ public:
SFX_DECL_INTERFACE(SW_BEZIERSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwBezierShell(SwView &rView);
void GetState(SfxItemSet &);
diff --git a/sw/source/core/uibase/inc/drawsh.hxx b/sw/source/core/uibase/inc/drawsh.hxx
index 88888c5..44eef8b 100644
--- a/sw/source/core/uibase/inc/drawsh.hxx
+++ b/sw/source/core/uibase/inc/drawsh.hxx
@@ -29,6 +29,11 @@ public:
SFX_DECL_INTERFACE(SW_DRAWSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwDrawShell(SwView &rView);
void Execute(SfxRequest &);
diff --git a/sw/source/core/uibase/inc/drformsh.hxx b/sw/source/core/uibase/inc/drformsh.hxx
index 9468a82..2cdcc11 100644
--- a/sw/source/core/uibase/inc/drformsh.hxx
+++ b/sw/source/core/uibase/inc/drformsh.hxx
@@ -29,6 +29,11 @@ public:
SFX_DECL_INTERFACE(SW_DRAWFORMSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwDrawFormShell(SwView &rView);
virtual ~SwDrawFormShell();
diff --git a/sw/source/core/uibase/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx
index b5ed0a2..1c6406a 100644
--- a/sw/source/core/uibase/inc/drwbassh.hxx
+++ b/sw/source/core/uibase/inc/drwbassh.hxx
@@ -18,6 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_UI_INC_DRWBASSH_HXX
#define INCLUDED_SW_SOURCE_UI_INC_DRWBASSH_HXX
+
#include "basesh.hxx"
class SwView;
@@ -30,7 +31,7 @@ class SwDrawBaseShell: public SwBaseShell
{
SwDrawBase* pDrawActual;
- sal_uInt16 eDrawMode;
+ sal_uInt16 eDrawMode;
DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
@@ -41,14 +42,18 @@ public:
SFX_DECL_INTERFACE(SW_DRAWBASESHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
void Execute(SfxRequest &);
void GetState(SfxItemSet &);
void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
void DisableState(SfxItemSet &rSet) { Disable(rSet);}
- sal_Bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
+ sal_Bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
void StateStatusline(SfxItemSet &rSet);
-
};
#endif
diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
index 1da91e4..9046db4 100644
--- a/sw/source/core/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/core/uibase/inc/drwtxtsh.hxx
@@ -36,11 +36,17 @@ class SwDrawTextShell: public SfxShell
void SetAttrToMarked(const SfxItemSet& rAttr);
void InsertSymbol(SfxRequest& rReq);
- sal_Bool IsTextEdit();
+ sal_Bool IsTextEdit();
+
public:
SFX_DECL_INTERFACE(SW_DRWTXTSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwView &GetView() { return rView; }
SwWrtShell &GetShell();
diff --git a/sw/source/core/uibase/inc/frmsh.hxx b/sw/source/core/uibase/inc/frmsh.hxx
index 4bed75f..1e43a96 100644
--- a/sw/source/core/uibase/inc/frmsh.hxx
+++ b/sw/source/core/uibase/inc/frmsh.hxx
@@ -23,10 +23,14 @@
class SwFrameShell: public SwBaseShell
{
-
public:
SFX_DECL_INTERFACE(SW_FRAMESHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwFrameShell(SwView &rView);
virtual ~SwFrameShell();
diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
index eac10f0..e5e5e73 100644
--- a/sw/source/core/uibase/inc/glshell.hxx
+++ b/sw/source/core/uibase/inc/glshell.hxx
@@ -32,10 +32,14 @@ protected:
virtual bool Save() SAL_OVERRIDE;
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_GLOSDOCSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwGlosDocShell( sal_Bool bNewShow = sal_True);
virtual ~SwGlosDocShell();
@@ -62,10 +66,14 @@ protected:
virtual bool Save() SAL_OVERRIDE;
public:
-
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwWebGlosDocShell();
virtual ~SwWebGlosDocShell();
diff --git a/sw/source/core/uibase/inc/grfsh.hxx b/sw/source/core/uibase/inc/grfsh.hxx
index b05b5cb..3c34183 100644
--- a/sw/source/core/uibase/inc/grfsh.hxx
+++ b/sw/source/core/uibase/inc/grfsh.hxx
@@ -26,6 +26,11 @@ class SwGrfShell: public SwBaseShell
public:
SFX_DECL_INTERFACE(SW_GRFSHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
void Execute(SfxRequest& rRequest);
void ExecAttr(SfxRequest& rRequest);
void GetAttrState(SfxItemSet& rRequest);
diff --git a/sw/source/core/uibase/inc/listsh.hxx b/sw/source/core/uibase/inc/listsh.hxx
index ee6a57c..9efeee3 100644
--- a/sw/source/core/uibase/inc/listsh.hxx
+++ b/sw/source/core/uibase/inc/listsh.hxx
@@ -27,6 +27,11 @@ public:
SFX_DECL_INTERFACE(SW_LISTSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwListShell(SwView &rView);
void Execute(SfxRequest &);
diff --git a/sw/source/core/uibase/inc/mediash.hxx b/sw/source/core/uibase/inc/mediash.hxx
index 8d8cfd7..a197cdc 100644
--- a/sw/source/core/uibase/inc/mediash.hxx
+++ b/sw/source/core/uibase/inc/mediash.hxx
@@ -26,6 +26,11 @@ class SwMediaShell: public SwBaseShell
public:
SFX_DECL_INTERFACE(SW_MEDIASHELL)
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
void ExecMedia(SfxRequest &);
void GetMediaState(SfxItemSet &);
diff --git a/sw/source/core/uibase/inc/navsh.hxx b/sw/source/core/uibase/inc/navsh.hxx
index d05983a..3c103e9 100644
--- a/sw/source/core/uibase/inc/navsh.hxx
+++ b/sw/source/core/uibase/inc/navsh.hxx
@@ -16,13 +16,19 @@ class SfxItemSet;
class SwNavigationShell: public SwBaseShell
{
public:
- SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL)
+ SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL)
- SwNavigationShell(SwView &rView);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
- void GetState(SfxItemSet &);
- void Execute(SfxRequest &);
+public:
+ SwNavigationShell(SwView &rView);
+
+ void GetState(SfxItemSet &);
+ void Execute(SfxRequest &);
};
#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/olesh.hxx b/sw/source/core/uibase/inc/olesh.hxx
index f9b6108..15c8a21 100644
--- a/sw/source/core/uibase/inc/olesh.hxx
+++ b/sw/source/core/uibase/inc/olesh.hxx
@@ -26,8 +26,12 @@ class SwOleShell: public SwFrameShell
public:
SFX_DECL_INTERFACE(SW_OLESHELL)
- SwOleShell(SwView &rView);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+public:
+ SwOleShell(SwView &rView);
};
#endif
diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx
index 59bdf83..4db7139 100644
--- a/sw/source/core/uibase/inc/pview.hxx
+++ b/sw/source/core/uibase/inc/pview.hxx
@@ -220,6 +220,11 @@ public:
SFX_DECL_INTERFACE(SW_PAGEPREVIEW)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
inline Window* GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); }
inline SwViewShell* GetViewShell() const { return pViewWin->GetViewShell(); }
inline const Rectangle& GetVisArea() const { return aVisArea; }
diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx
index 6ac7f30..43636d5 100644
--- a/sw/source/core/uibase/inc/srcview.hxx
+++ b/sw/source/core/uibase/inc/srcview.hxx
@@ -50,11 +50,15 @@ protected:
sal_Bool bRecursive = sal_False);
public:
-
SFX_DECL_VIEWFACTORY(SwSrcView);
SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwSrcView(SfxViewFrame* pFrame, SfxViewShell*);
virtual ~SwSrcView();
diff --git a/sw/source/core/uibase/inc/tabsh.hxx b/sw/source/core/uibase/inc/tabsh.hxx
index 9928fcb..78c23cd 100644
--- a/sw/source/core/uibase/inc/tabsh.hxx
+++ b/sw/source/core/uibase/inc/tabsh.hxx
@@ -36,6 +36,11 @@ public:
SFX_DECL_INTERFACE(SW_TABSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
void Execute(SfxRequest &);
void GetState(SfxItemSet &);
void GetFrmBorderState(SfxItemSet &rSet);
diff --git a/sw/source/core/uibase/inc/textsh.hxx b/sw/source/core/uibase/inc/textsh.hxx
index 9bb4727..3adf866 100644
--- a/sw/source/core/uibase/inc/textsh.hxx
+++ b/sw/source/core/uibase/inc/textsh.hxx
@@ -37,10 +37,14 @@ class SwTextShell: public SwBaseShell
bool InsertMediaDlg( SfxRequest& );
public:
-
SFX_DECL_INTERFACE(SW_TEXTSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * );
DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * );
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 6526b22..b1b736d 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
@@ -394,11 +394,15 @@ protected:
using SfxShell::GetDispatcher;
public:
-
SFX_DECL_VIEWFACTORY(SwView);
SFX_DECL_INTERFACE(SW_VIEWSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SfxDispatcher &GetDispatcher();
void GotFocus() const;
diff --git a/sw/source/core/uibase/inc/wformsh.hxx b/sw/source/core/uibase/inc/wformsh.hxx
index 697c67a..90ec9b1 100644
--- a/sw/source/core/uibase/inc/wformsh.hxx
+++ b/sw/source/core/uibase/inc/wformsh.hxx
@@ -25,9 +25,15 @@ class SwWebDrawFormShell : public SwDrawFormShell
{
public:
SwWebDrawFormShell(SwView &rShell);
- virtual ~SwWebDrawFormShell();
+ virtual ~SwWebDrawFormShell();
SFX_DECL_INTERFACE(SW_WEBDRAWFORMSHELL)
+
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
TYPEINFO_OVERRIDE();
};
diff --git a/sw/source/core/uibase/inc/wfrmsh.hxx b/sw/source/core/uibase/inc/wfrmsh.hxx
index 390acd2..60286b9 100644
--- a/sw/source/core/uibase/inc/wfrmsh.hxx
+++ b/sw/source/core/uibase/inc/wfrmsh.hxx
@@ -24,11 +24,15 @@
class SwWebFrameShell: public SwFrameShell
{
-
public:
SFX_DECL_INTERFACE(SW_WEBFRAMESHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwWebFrameShell(SwView &rView);
virtual ~SwWebFrameShell();
};
diff --git a/sw/source/core/uibase/inc/wgrfsh.hxx b/sw/source/core/uibase/inc/wgrfsh.hxx
index 4a6a045..8060dbd 100644
--- a/sw/source/core/uibase/inc/wgrfsh.hxx
+++ b/sw/source/core/uibase/inc/wgrfsh.hxx
@@ -29,6 +29,10 @@ public:
SFX_DECL_INTERFACE(SW_WEBGRFSHELL)
TYPEINFO_OVERRIDE();
+
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
};
#endif
diff --git a/sw/source/core/uibase/inc/wlistsh.hxx b/sw/source/core/uibase/inc/wlistsh.hxx
index ad7bf69..19aede9 100644
--- a/sw/source/core/uibase/inc/wlistsh.hxx
+++ b/sw/source/core/uibase/inc/wlistsh.hxx
@@ -25,10 +25,16 @@ class SwWebListShell: public SwListShell
{
public:
SFX_DECL_INTERFACE(SW_WEBLISTSHELL)
+
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
TYPEINFO_OVERRIDE();
- virtual ~SwWebListShell();
- SwWebListShell(SwView &rView);
+ SwWebListShell(SwView &rView);
+ virtual ~SwWebListShell();
};
#endif
diff --git a/sw/source/core/uibase/inc/wolesh.hxx b/sw/source/core/uibase/inc/wolesh.hxx
index bf9dcad..093cc60 100644
--- a/sw/source/core/uibase/inc/wolesh.hxx
+++ b/sw/source/core/uibase/inc/wolesh.hxx
@@ -26,8 +26,13 @@ class SwWebOleShell: public SwOleShell
public:
SFX_DECL_INTERFACE(SW_WEBOLESHELL)
- virtual ~SwWebOleShell();
- SwWebOleShell(SwView &rView);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ SwWebOleShell(SwView &rView);
+ virtual ~SwWebOleShell();
};
#endif
diff --git a/sw/source/core/uibase/inc/wtabsh.hxx b/sw/source/core/uibase/inc/wtabsh.hxx
index bc367e2..a423b3c 100644
--- a/sw/source/core/uibase/inc/wtabsh.hxx
+++ b/sw/source/core/uibase/inc/wtabsh.hxx
@@ -27,8 +27,13 @@ public:
SFX_DECL_INTERFACE(SW_WEBTABSHELL)
TYPEINFO_OVERRIDE();
- virtual ~SwWebTableShell();
- SwWebTableShell(SwView &rView);
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
+ SwWebTableShell(SwView &rView);
+ virtual ~SwWebTableShell();
};
#endif
diff --git a/sw/source/core/uibase/inc/wtextsh.hxx b/sw/source/core/uibase/inc/wtextsh.hxx
index 713aa5e..be11aa4 100644
--- a/sw/source/core/uibase/inc/wtextsh.hxx
+++ b/sw/source/core/uibase/inc/wtextsh.hxx
@@ -24,11 +24,15 @@
class SwWebTextShell: public SwTextShell
{
-
public:
SFX_DECL_INTERFACE(SW_WEBTEXTSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwWebTextShell(SwView &rView);
virtual ~SwWebTextShell();
};
diff --git a/sw/source/core/uibase/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx
index fa19410..355eea9 100644
--- a/sw/source/core/uibase/inc/wview.hxx
+++ b/sw/source/core/uibase/inc/wview.hxx
@@ -26,12 +26,17 @@ class SW_DLLPUBLIC SwWebView: public SwView
{
protected:
virtual void SelectShell() SAL_OVERRIDE;
-public:
+public:
SFX_DECL_VIEWFACTORY(SwWebView);
SFX_DECL_INTERFACE(SW_WEBVIEWSHELL)
TYPEINFO_OVERRIDE();
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
+public:
SwWebView(SfxViewFrame* pFrame, SfxViewShell*);
virtual ~SwWebView();
};
commit b731d71c67b864b61f5c08e219140be59c473f53
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list