summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorPovilas Kanapickas <povilas.kanapickas@gmail.com>2010-10-18 19:37:48 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-18 19:38:00 +0100
commitbc8fcf207ffeee1dd6fb4a361b0ad5c5def21beb (patch)
tree43f54910146344613e641bd0b54cee3069292624 /sfx2
parent34f1c06830ae530bea4f11aca91e2836a53fd764 (diff)
remove non-compiled code
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/app.hxx4
-rw-r--r--sfx2/inc/sfx2/bindings.hxx4
-rw-r--r--sfx2/inc/sfx2/childwin.hxx11
-rw-r--r--sfx2/inc/sfx2/ctrlitem.hxx2
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx2
-rw-r--r--sfx2/inc/sfx2/docfac.hxx2
-rw-r--r--sfx2/inc/sfx2/dockwin.hxx4
-rw-r--r--sfx2/inc/sfx2/fcontnr.hxx6
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx7
-rw-r--r--sfx2/inc/sfx2/frame.hxx4
-rw-r--r--sfx2/inc/sfx2/hintpost.hxx2
-rw-r--r--sfx2/inc/sfx2/layout.hxx12
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx6
-rw-r--r--sfx2/inc/sfx2/macropg.hxx2
-rw-r--r--sfx2/inc/sfx2/mgetempl.hxx2
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx3
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx2
-rw-r--r--sfx2/inc/sfx2/module.hxx4
-rw-r--r--sfx2/inc/sfx2/newstyle.hxx2
-rw-r--r--sfx2/inc/sfx2/objface.hxx4
-rw-r--r--sfx2/inc/sfx2/objsh.hxx18
-rw-r--r--sfx2/inc/sfx2/prnmon.hxx29
-rw-r--r--sfx2/inc/sfx2/progress.hxx2
-rw-r--r--sfx2/inc/sfx2/request.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxbasecontroller.hxx2
-rw-r--r--sfx2/inc/sfx2/styfitem.hxx4
-rw-r--r--sfx2/inc/sfx2/styledlg.hxx2
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx6
-rw-r--r--sfx2/inc/sfx2/unoctitm.hxx2
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx2
-rw-r--r--sfx2/source/appl/appcfg.cxx11
-rw-r--r--sfx2/source/appl/appuno.cxx18
-rw-r--r--sfx2/source/appl/childwin.cxx37
-rw-r--r--sfx2/source/appl/workwin.cxx10
-rw-r--r--sfx2/source/control/msgpool.cxx20
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx11
-rw-r--r--sfx2/source/doc/Metadatable.cxx13
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx22
-rw-r--r--sfx2/source/doc/docfile.cxx12
-rw-r--r--sfx2/source/doc/doctempl.cxx15
-rw-r--r--sfx2/source/doc/objmisc.cxx11
-rw-r--r--sfx2/source/doc/objstor.cxx56
-rw-r--r--sfx2/source/doc/objxtor.cxx16
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx14
-rw-r--r--sfx2/source/layout/sfxtabpage.cxx23
-rw-r--r--sfx2/source/notify/hintpost.cxx8
-rw-r--r--sfx2/source/view/prnmon.cxx7
-rw-r--r--sfx2/source/view/viewprn.cxx42
49 files changed, 2 insertions, 502 deletions
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index e467185afbe8..20425e20339b 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -159,12 +159,10 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
SfxAppData_Impl* pAppData_Impl;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* );
SAL_DLLPRIVATE BOOL SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE);
SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE);
SAL_DLLPRIVATE void InitializeDisplayName_Impl();
-//#endif
static SfxApplication* Create();
void Init();
@@ -258,7 +256,6 @@ public:
const String* pPostStr = 0);
void ResetLastDir();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static SfxApplication* Get() { return pApp;}
SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
@@ -316,7 +313,6 @@ public:
SAL_DLLPRIVATE SfxSlotPool& GetAppSlotPool_Impl() const;
SAL_DLLPRIVATE SfxModule* GetModule_Impl();
SAL_DLLPRIVATE ResMgr* GetOffResManager_Impl();
-//#endif
/* loads a branded bitmap - that can be overridden per locale */
static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 6a88f7cedad9..02b982a7d4e8 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -117,7 +117,6 @@ friend class SfxBindings_Impl;
SfxDispatcher* pDispatcher; // zu verwendender Dispatcher
sal_uInt16 nRegLevel; // Lock-Level waehrend Reconfig
-//#if 0 // _SOLAR__PRIVATE
private:
SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi,
SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE);
@@ -135,7 +134,6 @@ private:
const SfxPoolItem *pItem,
SfxItemState eItemState );
DECL_DLLPRIVATE_LINK( NextJob_Impl, Timer * );
-//#endif
public:
SfxBindings();
@@ -193,7 +191,6 @@ public:
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetRecorder() const;
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, sal_Bool bMasterCommand );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
@@ -214,7 +211,6 @@ public:
SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId );
-//#endif
};
#ifdef DBG_UTIL
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index fd1eb65d54df..5c22a9b5fc2c 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -77,13 +77,11 @@ struct SfxChildWinInfo
bVisible = sal_False;
nFlags = 0;
}
-//#if 0 // _SOLAR__PRIVATE
sal_Bool GetExtraData_Impl( SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign = 0,
Size *pSize = 0,
sal_uInt16 *pLine = 0,
sal_uInt16 *pPos = 0 ) const;
-//#endif
};
// Factory-Methode eines ChildWindows
@@ -126,16 +124,11 @@ struct SfxChildWinFactory
, pArr( NULL )
{}
-//#if 0 // _SOLAR__PRIVATE
~SfxChildWinFactory()
{
delete pArr;
}
-//#else
- // Der WIN16-Compiler versucht dort zu "ubersetzen, wo dieser Header
- // included wird, und kann dann nat"urlich nicht linken, wenn inline ...
-// ~SfxChildWinFactory();
-//#endif
+
};
class FloatingWindow;
@@ -240,7 +233,6 @@ public:
virtual com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&);
SAL_DLLPRIVATE void SetVisible_Impl( sal_Bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
@@ -252,7 +244,6 @@ public:
GetContext_Impl() const
{ return pContext; }
SAL_DLLPRIVATE void SetFactory_Impl( SfxChildWinFactory* );
-//#endif
};
//------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index 53667fbf0aa7..261e62f8aa99 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -85,11 +85,9 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL IsBindable_Impl() const
{ return pBindings != NULL; }
SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* );
-//#endif
};
//====================================================================
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index f0dd2248c456..58c78c1c05ac 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -234,7 +234,6 @@ public:
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
SAL_DLLPRIVATE void SetMenu_Impl();
SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
@@ -258,7 +257,6 @@ public:
SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew );
SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL);
SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr );
-//#endif
};
//--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 89062d7b7263..0ba39ae49798 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -108,11 +108,9 @@ public:
SfxModule* GetModule() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModule_Impl( SfxModule* );
SAL_DLLPRIVATE static void UpdateFilterContainers_Impl();
SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const;
-//#endif
private:
// Kopieren verboten
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 254bd622d9bc..da05ba7c6f7d 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -76,9 +76,7 @@ protected:
virtual BOOL Close();
virtual void Move();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; }
-//#endif
public:
SfxDockingWindow( SfxBindings *pBindings,
@@ -113,7 +111,6 @@ public:
void AutoShow( BOOL bShow = TRUE );
DECL_LINK( TimerHdl, Timer* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE USHORT GetWinBits_Impl() const;
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
@@ -125,7 +122,6 @@ public:
SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned );
SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const;
SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
-//#endif
};
class SfxDockingWrapper : public SfxChildWindow
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index c80d61aa81d1..eb3e39af27e9 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -115,14 +115,12 @@ public:
const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
BOOL bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& );
-//#endif
};
class SfxFilterMatcher_Impl;
@@ -136,10 +134,8 @@ public:
SfxFilterMatcher();
~SfxFilterMatcher();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter );
DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* );
-//#endif
sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
@@ -164,9 +160,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
USHORT nCurrent;
const SfxFilterMatcher_Impl *pMatch;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE const SfxFilter* Find_Impl();
-//#endif
public:
SfxFilterMatcherIter( const SfxFilterMatcher* pMatchP, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED );
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index d8290c4dbc9e..5cf62ed7ac22 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -133,12 +133,9 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp;
FileDialogHelper_Impl *mpImp;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Int16 getDialogType( sal_Int64 nFlags ) const;
-//#endif
-
public:
FileDialogHelper( sal_Int64 nFlags,
const String& rFactory,
@@ -291,21 +288,18 @@ public:
DECL_LINK( ExecuteSystemFilePicker, void* );
-//#if 0 // _SOLAR__PRIVATE
ErrCode Execute( SvStringsDtor*& rpURLList,
SfxItemSet *& rpSet,
String& rFilter,
const String& rDirPath );
ErrCode Execute( SfxItemSet *& rpSet,
String& rFilter );
-//#endif
};
#define SFX2_IMPL_DIALOG_CONFIG 0
#define SFX2_IMPL_DIALOG_SYSTEM 1
#define SFX2_IMPL_DIALOG_OOO 2
-//#if 0 // _SOLAR__PRIVATE
ErrCode FileOpenDialog_Impl( sal_Int64 nFlags,
const String& rFact,
SvStringsDtor *& rpURLList,
@@ -315,7 +309,6 @@ ErrCode FileOpenDialog_Impl( sal_Int64 nFlags,
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG,
const String& rStandardDir = String::CreateFromAscii( "" ),
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >());
-//#endif
}
//-----------------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index bb7524f98d2e..61ec51a42841 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -183,7 +183,6 @@ public:
sal_Bool IsInPlace() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Bool DoClose_Impl();
SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void ReleasingComponent_Impl( sal_Bool bSet );
@@ -225,7 +224,6 @@ public:
SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
-//#endif
private:
SAL_DLLPRIVATE void Construct_Impl();
};
@@ -237,9 +235,7 @@ class SfxFrameIterator
const SfxFrame* pFrame;
sal_Bool bRecursive;
-//#if 0 // _SOLAR__PRIVATE
SfxFrame* NextSibling_Impl( SfxFrame& rPrev );
-//#endif
public:
SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecursive=sal_True );
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index 140e93beafa4..f5d10b0a933d 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -57,9 +57,7 @@ class SfxHintPoster: public SvRefBase
private:
void RegisterEvent();
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( DoEvent_Impl, SfxHint * );
-//#endif
protected:
virtual ~SfxHintPoster();
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index d92ed2ac4ac1..26a523fd332b 100644
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.hxx
@@ -49,18 +49,6 @@ public:
SfxDialog (::Window* parent, char const* xml_file, char const* id, SfxBindings* bindings=0, SfxChildWindow* child=0);
};
-#if 0
-class SFX2_DLLPUBLIC SfxTabDialog
- : public ::SfxTabDialog
- , public InPlug
-{
-public:
- SfxTabDialog (::Window *parent, char const* xml_file, char const* id, ResId const& res_id, SfxItemSet const* set=0);
- ::Window* GetParent () const;
- void FreeResource ();
-};
-#endif
-
class SFX2_DLLPUBLIC SfxTabPage
: public ::SfxTabPage
, public InPlug
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 6b50ddf3497a..9f106a4382e1 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -49,11 +49,7 @@ class SvStream;
class SvxMacro;
typedef SfxMacroInfo* SfxMacroInfoPtr;
-//#if 0 // _SOLAR__PRIVATE
SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5, 5)
-//#else
-//class SfxMacroInfoArr_Impl;
-//#endif
class SFX2_DLLPUBLIC SfxMacroInfo
{
@@ -144,12 +140,10 @@ public:
sal_Bool CheckMacro(sal_uInt16 nId) const;
sal_Bool CheckMacro( SfxObjectShell*, const SvxMacro* ) const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void Release_Impl();
SAL_DLLPRIVATE const SfxMacroInfo* GetMacroInfo_Impl( const SvxMacro *pMacro ) const;
DECL_DLLPRIVATE_LINK( CallbackHdl_Impl, SfxMacroConfig*);
DECL_DLLPRIVATE_LINK( EventHdl_Impl, SfxMacroInfo*);
-//#endif
};
#endif
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index d9d886cdfd5f..5787d63ea57b 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -55,7 +55,6 @@ class _SfxMacroTabPage_Impl;
class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
{
SvxMacroTableDtor aTbl;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
@@ -66,7 +65,6 @@ class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
-//#endif
protected:
_SfxMacroTabPage_Impl* mpImpl;
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index 0794de2eaffb..043d13c5cd2d 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -82,13 +82,11 @@ class SfxManageStyleSheetPage : public SfxTabPage
private:
friend class SfxStyleDialog;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( GetFocusHdl, Edit * );
DECL_LINK( LoseFocusHdl, Edit * );
void UpdateName_Impl(ListBox *, const String &rNew);
void SetDescriptionText_Impl();
-//#endif
SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet );
~SfxManageStyleSheetPage();
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index fe7d8bb36b1e..48a762f74c52 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -153,7 +153,6 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
-//#if 0 // _SOLAR__PRIVATE
class SfxAppMenuControl_Impl : public SfxMenuControl
{
@@ -171,6 +170,4 @@ public:
~SfxAppMenuControl_Impl();
};
-//#endif
-
#endif
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 64a90c74684d..740da8a9bde7 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -87,9 +87,7 @@ public:
ResMgr* GetResMgr() const { return pResMgr; }
void SetPopupMenu( USHORT nId, PopupMenu *pMenu );
-//#if 0 // _SOLAR__PRIVATE
void Construct_Impl( Menu* pMenu, BOOL bWithHelp );
-//#endif
};
//--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index ad83bb4a7418..36bb274234cc 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -65,9 +65,7 @@ private:
sal_Bool bDummy : 1;
SfxModule_Impl* pImpl;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Construct_Impl();
-//#endif
public:
TYPEINFO();
@@ -99,7 +97,6 @@ public:
static FieldUnit GetCurrentFieldUnit();
FieldUnit GetFieldUnit() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
SAL_DLLPRIVATE static void DestroyModules_Impl();
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
@@ -108,7 +105,6 @@ public:
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
-//#endif
};
#endif
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index fa30c4849f89..348579dea05b 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.hxx
@@ -49,10 +49,8 @@ private:
QueryBox aQueryOverwriteBox;
SfxStyleSheetBasePool& rPool;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( OKHdl, Control * );
DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * );
-//#endif
public:
SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& );
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 6025925e76bd..f5f15a71afba 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -107,12 +107,10 @@ public:
void Register( SfxModule* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE int ContainsSlot_Impl( const SfxSlot *pSlot ) const
{ return pSlot >= pSlots && pSlot < pSlots + Count(); }
SAL_DLLPRIVATE ResMgr* GetResManager_Impl() const
{ return aNameResId.GetResMgr(); }
-//#endif
};
//--------------------------------------------------------------------
@@ -133,7 +131,6 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
return nPos < nCount? pSlots+nPos: 0;
}
-//#if 0 // _SOLAR__PRIVATE
class SfxIFConfig_Impl
{
friend class SfxInterface;
@@ -147,6 +144,5 @@ public:
void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
USHORT GetType();
};
-//#endif
#endif
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 9c1a3fe0cfff..fd2dfc185d6e 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -52,9 +52,7 @@
// include something else
//________________________________________________________________________________________________________________
-//#if 0 // _SOLAR__PRIVATE
#include <vcl/timer.hxx>
-//#endif
#include <svl/poolitem.hxx>
#include <vcl/timer.hxx>
#include <vcl/bitmap.hxx>
@@ -223,16 +221,11 @@ private:
bIsTmp :1; // temp. Storage
private:
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> & i_xDocProps);
SAL_DLLPRIVATE sal_Bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet );
-//REMOVE sal_Bool SaveInfoAndConfig_Impl( SvStorageRef pNewStg );
-
-//#endif
-
protected:
SfxObjectShell(SfxObjectCreateMode);
SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx
@@ -314,10 +307,8 @@ public:
void SetSharedXMLFlag( sal_Bool bFlag ) const;
sal_Bool HasSharedXMLFlagSet() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModalMode_Impl(sal_Bool bModal=sal_True);
SAL_DLLPRIVATE void SetMacroMode_Impl(sal_Bool bModal=sal_True);
-//#endif
void ResetError();
sal_uInt32 GetError() const;
@@ -725,8 +716,6 @@ public:
// =================================
-//#if 0 // _SOLAR__PRIVATE
-
SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const;
SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
@@ -827,8 +816,6 @@ public:
0x9eaba5c3, 0xb232, 0x4309, \
0x84, 0x5f, 0x5f, 0x15, 0xea, 0x50, 0xd0, 0x74
-//#if 0 // _SOLAR__PRIVATE
-
struct ModifyBlocker_Impl
{
SfxObjectShell* pPersist;
@@ -845,7 +832,7 @@ public:
pPersist->EnableSetModified( bWasEnabled );
}
};
-//#endif
+
//--------------------------------------------------------------------
@@ -858,8 +845,6 @@ SV_IMPL_LOCK(SfxObjectShell)
SV_IMPL_REF(SfxObjectShell)
SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& rName, BOOL bWriting );
-
-//#if 0 // _SOLAR__PRIVATE
//--------------------------------------------------------------------
class AutoReloadTimer_Impl : public Timer
{
@@ -872,7 +857,6 @@ public:
SfxObjectShell* pSh );
virtual void Timeout();
};
-//#endif
//-------------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 26855b82d8c8..bfea4b6e5abf 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -43,35 +43,6 @@ struct SfxPrintProgress_Impl;
#define PAGE_MAX 9999 //max. Anzahl der Seiten die gedruckt werden
-//--------------------------------------------------------------------
-/*
-class SFX2_DLLPUBLIC SfxPrintProgress: public SfxProgress
-{
- SfxPrintProgress_Impl* pImp;
-
-private:
-//#if 0 // _SOLAR__PRIVATE
- DECL_DLLPRIVATE_LINK( PrintErrorNotify, void * );
- DECL_DLLPRIVATE_LINK( StartPrintNotify, void * );
- DECL_DLLPRIVATE_LINK( EndPrintNotify, void * );
-//#endif
-public:
- SfxPrintProgress( SfxViewShell* pViewSh,
- bool bShow = TRUE );
- virtual ~SfxPrintProgress();
-
- virtual void SetText( const String &rText );
- BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 );
- virtual BOOL SetState( ULONG nVal, ULONG nNewRange = 0 );
-
- void RestoreOnEndPrint( SfxPrinter *pOldPrinter );
- void RestoreOnEndPrint( SfxPrinter *pOldPrinter,
- BOOL bOldEnablePrintFile );
- void DeleteOnEndPrint();
- void SetCancelHdl( const Link& aCancelHdl );
- BOOL IsAborted() const;
-};
-*/
// ------------------------------------------------------------------------
struct SfxPrintOptDlg_Impl;
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 70645f5b08dd..138fa003293e 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -79,12 +79,10 @@ public:
static void EnterLock();
static void LeaveLock();
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
SAL_DLLPRIVATE bool StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
SAL_DLLPRIVATE const String& GetStateText_Impl() const;
-//#endif
};
#endif
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index dd8005f8470b..015367ed0bc1 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -61,7 +61,6 @@ friend struct SfxRequest_Impl;
SfxRequest_Impl* pImp;
//---------------------------------------------------------------------
-//#if 0 // _SOLAR__PRIVATE
public:
SAL_DLLPRIVATE void Record_Impl( SfxShell &rSh, const SfxSlot &rSlot,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder,
@@ -69,7 +68,6 @@ public:
private:
SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet );
-//#endif
//---------------------------------------------------------------------
public:
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index ca30d243bbac..5d674123033d 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -385,7 +385,6 @@ public:
virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-//#if 0 // _SOLAR__PRIVATE
// FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
// either the _Impl name should vanish or there should be an "official" API
SfxViewShell* GetViewShell_Impl() const;
@@ -394,7 +393,6 @@ public:
SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs );
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper ();
-//#endif
private:
enum ConnectSfxFrame
{
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 93f7e9492b4a..6ae095407516 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -74,11 +74,7 @@ public:
void SetImage( const Image& _rImg ) { aImage = _rImg; }
};
-//#if 0 // _SOLAR__PRIVATE
DECLARE_LIST(SfxStyleFamilyList, SfxStyleFamilyItem*)
-//#else
-//typedef List SfxStyleFamilyList;
-//#endif
class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource
{
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index 9e2ffdadac4d..7b0a86b25fdd 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.hxx
@@ -38,9 +38,7 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog
{
private:
SfxStyleSheetBase* pStyle;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
-//#endif
protected:
virtual const SfxItemSet* GetRefreshedSet();
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index cedc8f256010..ec12da4ca5b2 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -110,7 +110,6 @@ friend class SfxTabDialogController;
BOOL bItemsReset;
BOOL bFmt;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( OkHdl, Button * );
@@ -119,7 +118,6 @@ friend class SfxTabDialogController;
DECL_DLLPRIVATE_LINK( UserHdl, Button * );
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
-//#endif
protected:
virtual short Ok();
@@ -226,10 +224,8 @@ public:
void SetApplyHandler(const Link& _rHdl);
Link GetApplyHandler() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Start_Impl();
SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); }
-//#endif
};
END_NAMESPACE_LAYOUT_SFX_TABDIALOG
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 43f31f807a48..649b6a886143 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -127,10 +127,7 @@ private:
SAL_DLLPRIVATE SfxPopupWindow(SfxPopupWindow &); // not defined
SAL_DLLPRIVATE void operator =(SfxPopupWindow &); // not defined
-
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( Delete, void * );
-//#endif
protected:
virtual void PopupModeEnd();
@@ -316,7 +313,6 @@ public:
//=========================================================================
-//#if 0 // _SOLAR__PRIVATE
class SfxDragButton_Impl : public FixedImage
{
@@ -441,6 +437,4 @@ public:
void RefreshMenuImages( Menu* pMenu );
};
-//#endif
-
#endif
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index f30a544922b5..e0f4c31b431d 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -164,7 +164,6 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-//#if 0 // _SOLAR__PRIVATE
class SfxDispatchController_Impl : public SfxControllerItem
{
::com::sun::star::util::URL aDispatchURL;
@@ -205,7 +204,6 @@ public:
SfxDispatcher* GetDispatcher();
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
};
-//#endif
#endif
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index d4bc360c84c9..7549fb3bc031 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -205,7 +205,6 @@ public:
void ChildWindowExecute(SfxRequest&);
void ChildWindowState(SfxItemSet&);
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetDowning_Impl();
SAL_DLLPRIVATE void GetDocNumber_Impl();
SAL_DLLPRIVATE BOOL IsDowning_Impl() const;
@@ -249,7 +248,6 @@ public:
SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID );
SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL );
-//#endif
private:
SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE );
SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index df8a9378dcd7..dfff1bd62ae0 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -826,17 +826,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
// INet Session neu aufsetzen
if ( bResetSession )
{
- // no more sj2
- #if 0
- try
- {
- SjApplet2::settingsChanged();
- }
- catch ( ... )
- {
- DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" );
- }
- #endif
}
// geaenderte Daten speichern
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index e19a3ea23e84..fe7fb1c7240b 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2157,17 +2157,6 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
xNewKey = xKey->createKey( aTempStr );
xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
- #if 0
- // AppletObject
- aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aImpl += ::sfx2::AppletObject::impl_getStaticImplementationName();
-
- aTempStr = aImpl;
- aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
- xNewKey = xKey->createKey( aTempStr );
- xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
- #endif
-
// IFrameObject
aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aImpl += ::sfx2::IFrameObject::impl_getStaticImplementationName();
@@ -2343,13 +2332,6 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
IF_NAME_CREATECOMPONENTFACTORY( TestMouseClickHandler )
#endif
IF_NAME_CREATECOMPONENTFACTORY( OPackageStructureCreator )
- #if 0
- if ( ::sfx2::AppletObject::impl_getStaticImplementationName().equals(
- ::rtl::OUString::createFromAscii( pImplementationName ) ) )
- {
- xFactory = ::sfx2::AppletObject::impl_createFactory();
- }
- #endif
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::PluginObject )
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject )
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService )
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index e8440d29ca8b..95a4049da64f 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -372,43 +372,6 @@ sal_uInt16 SfxChildWindow::GetPosition()
return pImp->pFact->nPos;
}
-#if 0
-static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr )
-{
- ULONG nValidMask = 0;
- xub_StrLen nIndex = 0;
- ByteString aTokenStr;
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rPos.X() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_X;
- }
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rPos.Y() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_Y;
- }
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rSize.Width() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_WIDTH;
- }
-
- aTokenStr = rStr.GetToken( 0, ';', nIndex );
- if ( aTokenStr.Len() )
- {
- rSize.Height() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_HEIGHT;
- }
-}
-#endif
-
//-------------------------------------------------------------------------
void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWinInfo& rInfo )
{
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index b2aac0f43d68..b74109e14b48 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1650,11 +1650,6 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
if ( bSetFocus )
bSetFocus = pChildWin->WantsFocus();
pChildWin->SetWorkWindow_Impl( this );
-#if 0
- // Enable-Status richtig setzen
- pChildWin->GetWindow()->EnableInput( pCW->bEnable &&
- ( pWorkWin->IsInputEnabled() /* || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT */ ) );
-#endif
// Zumindest der ExtraString wird beim Auswerten ver"andert, also neu holen
SfxChildWinInfo aInfo = pChildWin->GetInfo();
pCW->aInfo.aExtraString = aInfo.aExtraString;
@@ -2216,11 +2211,6 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
pCW->nInterfaceId = nInter;
pCW->nVisibility = nMode;
pCW->bEnable = bEnabled;
-#if 0
- if ( pCW->pWin )
- pCW->pWin->GetWindow()->EnableInput( bEnabled &&
- ( pWorkWin->IsInputEnabled() /* || pCW->pWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT */ ) );
-#endif
pCW->nVisibility = nMode;
}
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index de878a4c548f..80fe94ce72fe 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -149,26 +149,6 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
else
_pGroups->Append(pDef->GetGroupId());
}
-#if 0
- const TypeId &rTypeId = pDef->GetType()->Type();
- if ( /*rTypeId != TYPE(SfxVoidItem) &&*/ rTypeId != 0 )
- {
- USHORT nPos;
- for ( nPos = 0; nPos < _pTypes->Count(); ++nPos )
- {
- if ( _pTypes->GetObject(nPos)->nId == pDef->GetSlotId() )
- {
- DBG_ASSERT( rTypeId == _pTypes->GetObject(nPos)->nType,
- "same slot id with unequal item types" );
- }
- else if ( _pTypes->GetObject(nPos)->nId > pDef->GetSlotId() )
- break;
- }
- if ( nPos >= _pTypes->Count() ||
- _pTypes->GetObject(nPos)->nId > pDef->GetSlotId() )
- _pTypes->Append( new SfxSlotType_Impl( pDef->GetSlotId(), rTypeId ) );
- }
-#endif
}
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 4062bcc1e97d..6bb734c10c76 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -175,17 +175,6 @@ uno::Reference<rdf::XURI> createBaseURI(
// if ( pkgURI.getLength() && ::utl::UCBContentHelper::IsFolder(pkgURI) )
if (true) {
xBaseURI.set( xPkgURI, uno::UNO_SET_THROW );
-#if 0
- } else {
- const uno::Reference<uri::XVndSunStarPkgUrlReferenceFactory>
- xPkgUriFactory( xServiceFactory->createInstanceWithContext(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"),
- i_xContext),
- uno::UNO_QUERY_THROW);
- xBaseURI.set( xPkgUriFactory->createVndSunStarPkgUrlReference(xPkgURI),
- uno::UNO_SET_THROW );
-#endif
}
::rtl::OUStringBuffer buf;
if (!xBaseURI->getUriReference().endsWithAsciiL("/", 1))
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index cbb623ce9e60..fc76c7733831 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1472,19 +1472,6 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource,
{
OSL_ENSURE(false, "neither RegDoc nor RegClp cannot happen");
}
-#if 0
- {
- //FIXME: do we need this at all???
- XmlIdRegistryDocument & rRegDoc(
- dynamic_cast<XmlIdRegistryDocument&>( rReg ) );
- {
- if (rRegDoc.TryRegisterMetadatable(*this, SourceRef))
- {
- this->m_pReg = &rRegDoc;
- }
- }
- }
-#endif
}
}
catch (uno::Exception &)
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 78a9dc4e1911..f9111cb7f6bd 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2446,26 +2446,4 @@ static ::cppu::ImplementationEntry const entries[] = {
{ 0, 0, 0, 0, 0, 0 }
};
-#if 0
-extern "C" void SAL_CALL component_getImplementationEnvironment(
- const char ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-extern "C" void * SAL_CALL component_getFactory(
- const char * implName, void * serviceManager, void * registryKey)
-{
- return ::cppu::component_getFactoryHelper(
- implName, serviceManager, registryKey, entries);
-}
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- void * serviceManager, void * registryKey)
-{
- return ::cppu::component_writeInfoHelper(serviceManager, registryKey,
- entries);
-}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index bcb1981365f5..19ced3f09391 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2774,18 +2774,6 @@ void SfxMedium::CloseStreams_Impl()
void SfxMedium::RefreshName_Impl()
{
-#if 0 //(dv)
- if ( pImp->aContent.get().is() )
- {
- String aNameP = pImp->xAnchor->GetViewURL();
- pImp->aOrigURL = aNameP;
- aLogicName = aNameP;
- DELETEZ( pURLObj );
- if (aLogicName.Len())
- aLogicName = GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
- SetIsRemote_Impl();
- }
-#endif //(dv)
}
void SfxMedium::SetIsRemote_Impl()
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d3515420a7ac..953f9de242f6 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -932,21 +932,6 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
{
DBG_ERRORFILE( "Don't know, what to do!" );
return sal_False;
-#if 0
- // Verschieben einer Vorlage innerhalb eines Bereiches
- // --> nur Verwaltungsdaten aktualisieren
- if ( bMove && nTargetRegion == nSourceRegion )
- {
- if(nTargetIdx == USHRT_MAX)
- nTargetIdx = 0;
- const SfxTemplateDirEntryPtr pEntry = rTargetDir[nSourceIdx];
- rTargetDir.Insert(pEntry, nTargetIdx);
- if(nTargetIdx < nSourceIdx)
- ++nSourceIdx;
- rTargetDir.Remove(nSourceIdx);
- return SaveDir(rTargetDir);
- }
-#endif
}
RegionData_Impl *pSourceRgn = pImp->GetRegion( nSourceRegion );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a5b5620539cf..d4f7bc8f17a1 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -820,17 +820,6 @@ void SfxObjectShell::SetTitle
return;
SfxApplication *pSfxApp = SFX_APP();
-#if 0
- // wird 'unbenannt#' als Titel gesetzt
- String aNoName(SfxResId(STR_NONAME));
- if ( rTitle.Match(aNoName) <= aNoName.Len() )
- {
- // er ist es selbst => ignorieren
- pSfxApp->ReleaseIndex(pImp->nVisualDocumentNumber);
- pImp->bIsNamedVisible=0;
- }
-#endif
-
// ggf. die unbenannt-Nummer freigeben
if ( pImp->bIsNamedVisible && USHRT_MAX != pImp->nVisualDocumentNumber )
{
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e52a926fbc1d..3e0aa30e7ca4 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -807,62 +807,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
if (bReconnectDde)
ReconnectDdeLinks(*this);
-
-#if 0
- if ( pMedium->HasStorage_Impl() )
- {
- uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
- if ( xHandler.is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
- {
- uno::Reference<beans::XPropertySet> xStorageProps( pMedium->GetStorage(), uno::UNO_QUERY_THROW );
- ::rtl::OUString sVersion;
- try
- {
- xStorageProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ) ) >>= sVersion;
- }
- catch( const uno::Exception& )
- {
- // Custom Property "ODFVersion" does not exist
- }
-
- if ( sVersion.getLength() )
- {
- double nVersion = sVersion.toDouble();
- if ( nVersion > 1.20001 && SfxObjectShell_Impl::NeedsOfficeUpdateDialog() )
- // ODF version greater than 1.2 - added some decimal places to be safe against floating point conversion errors (hack)
- {
- ::rtl::OUString sDocumentURL( pMedium->GetOrigURL() );
- ::rtl::OUString aSystemFileURL;
- if ( osl::FileBase::getSystemPathFromFileURL( sDocumentURL, aSystemFileURL ) == osl::FileBase::E_None )
- sDocumentURL = aSystemFileURL;
-
- FutureDocumentVersionProductUpdateRequest aUpdateRequest;
- aUpdateRequest.Classification = InteractionClassification_QUERY;
- aUpdateRequest.DocumentURL = sDocumentURL;
-
- ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest = new ::comphelper::OInteractionRequest( makeAny( aUpdateRequest ) );
- pRequest->addContinuation( new ::comphelper::OInteractionApprove );
- pRequest->addContinuation( new ::comphelper::OInteractionAbort );
-
- typedef ::comphelper::OInteraction< XInteractionAskLater > OInteractionAskLater;
- OInteractionAskLater* pLater = new OInteractionAskLater;
- pRequest->addContinuation( pLater );
-
- try
- {
- xHandler->handle( pRequest.get() );
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
- if ( pLater->wasSelected() )
- SFX_APP()->Get_Impl()->bODFVersionWarningLater = true;
- }
- }
- }
- }
-#endif
}
else
GetpApp()->HideStatusText();
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 92677fa33e08..54e7b93f59e6 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -840,22 +840,6 @@ void SfxObjectShell::InitBasicManager_Impl()
}
//--------------------------------------------------------------------
-#if 0 //(mba)
-SotObjectRef SfxObjectShell::CreateAggObj( const SotFactory* pFact )
-{
- // SvDispatch?
- SotFactory* pDispFact = SvDispatch::ClassFactory();
- if( pFact == pDispFact )
- return( (SfxShellObject*)GetSbxObject() );
-
- // sonst unbekannte Aggregation
- DBG_ERROR("unkekannte Factory");
- SotObjectRef aSvObjectRef;
- return aSvObjectRef;
-}
-#endif
-
-//--------------------------------------------------------------------
sal_uInt16 SfxObjectShell::Count()
{
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 6b6f41eced87..7ca91f3eb53f 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3393,20 +3393,6 @@ awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ )
Rectangle aTmpRect = m_pData->m_pObjectShell->GetVisArea( ASPECT_CONTENT );
-#if 0
- Window* pWindow = NULL;
- SfxViewFrame* pViewFrm = m_pData->m_pObjectShell.Is() ?
- SfxViewFrame::GetFirst( m_pData->m_pObjectShell, 0, sal_False ) : 0;
-
- if ( pWindow )
- {
- MapMode aInternalMapMode( pViewFrm->GetWindow().GetMapMode() );
- MapMode aExternalMapMode( m_pData->m_pObjectShell->GetMapUnit() );
-
- aTmpRect = OutputDevice::LogicToLogic( aTmpRect, aInternalMapMode, aExternalMapMode );
- }
-#endif
-
return awt::Size( aTmpRect.GetWidth(), aTmpRect.GetHeight() );
}
diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx
index d7df62a2d22b..b7a857c6fbde 100644
--- a/sfx2/source/layout/sfxtabpage.cxx
+++ b/sfx2/source/layout/sfxtabpage.cxx
@@ -36,29 +36,6 @@ namespace layout
using namespace ::com::sun::star;
-#if 0
-SfxTabDialog::SfxTabDialog (::Window *parent, char const* xml_file, char const* id, ResId const& res_id, SfxItemSet const* set)
- : ::SfxTabDialog (parent, res_id, set)
- , InPlug (parent, xml_file, id)
-{
-}
-
-::Window* SfxTabDialog::GetParent () const
-{
- return Window::GetParent ();
-}
-
-::Window* SfxTabDialog::GetWindow () const
-{
- return Window::GetParent ();
-}
-
-void SfxTabDialog::FreeResource ()
-{
- //::Window::FreeResource ();
-}
-#endif
-
SfxTabPage::SfxTabPage (::Window *parent, char const* xml_file, char const* id, SfxItemSet const* set)
: ::SfxTabPage (parent, 0, *set)
, InPlug (parent, xml_file, id)
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index ea24a66ceb35..09299a152102 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -98,13 +98,5 @@ void SfxHintPoster::SetEventHdl( const GenLink& rLink )
#define LOG( x )
-#if 0
-#define LOG( x ) \
-{ \
- SvFileStream aStrm( "f:\\temp\\log", STREAM_READWRITE ); \
- aStrm.Seek( STREAM_SEEK_TO_END ); \
- aStrm << x.GetStr() << '\n'; \
-}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index 36c3025698b0..200e74475fe1 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -269,13 +269,6 @@ SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, bool bShow )
String(SfxResId(STR_PRINTING)), 1, FALSE ),
pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
{
- #if 0
- pImp->pPrinter->SetEndPrintHdl( LINK( this, SfxPrintProgress, EndPrintNotify ) );
- pImp->pPrinter->SetErrorHdl( LINK( this, SfxPrintProgress, PrintErrorNotify ) );
- pImp->pPrinter->SetStartPrintHdl( LINK( this, SfxPrintProgress, StartPrintNotify ) );
- pImp->bCallbacks = TRUE;
- #endif
-
SfxObjectShell* pDoc = pViewSh->GetObjectShell();
SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE );
if ( pItem && pItem->GetValue() )
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 47e8843ac294..6109e7bab7f0 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -928,15 +928,7 @@ PrintDialog* SfxViewShell::CreatePrintDialog( Window* /*pParent*/ )
*/
{
- #if 0
- PrintDialog *pDlg = new PrintDialog( pParent, false );
- pDlg->SetFirstPage( 1 );
- pDlg->SetLastPage( 9999 );
- pDlg->EnableCollate();
- return pDlg;
- #else
return NULL;
- #endif
}
//--------------------------------------------------------------------
@@ -952,42 +944,8 @@ ErrCode SfxViewShell::DoPrint( SfxPrinter* /*pPrinter*/,
PrintDialog* /*pPrintDlg*/,
BOOL /*bSilent*/, BOOL /*bIsAPI*/ )
{
- #if 0
- // Printer-Dialogbox waehrend des Ausdrucks mu\s schon vor
- // StartJob erzeugt werden, da SV bei einem Quit-Event h"angt
- SfxPrintProgress *pProgress = new SfxPrintProgress( this, !bSilent );
- SfxPrinter *pDocPrinter = GetPrinter(TRUE);
- if ( !pPrinter )
- pPrinter = pDocPrinter;
- else if ( pDocPrinter != pPrinter )
- {
- pProgress->RestoreOnEndPrint( pDocPrinter->Clone() );
- SetPrinter( pPrinter, SFX_PRINTER_PRINTER );
- }
- pProgress->SetWaitMode(FALSE);
-
- // Drucker starten
- PreparePrint( pPrintDlg );
- SfxObjectShell *pObjShell = GetViewFrame()->GetObjectShell();
- if ( pPrinter->StartJob(pObjShell->GetTitle(0)) )
- {
- // Drucken
- Print( *pProgress, bIsAPI, pPrintDlg );
- pProgress->Stop();
- pProgress->DeleteOnEndPrint();
- pPrinter->EndJob();
- }
- else
- {
- // Printer konnte nicht gestartet werden
- delete pProgress;
- }
-
- return pPrinter->GetError();
- #else
DBG_ERROR( "DoPrint called, dead code !" );
return ERRCODE_IO_NOTSUPPORTED;
- #endif
}
//--------------------------------------------------------------------