diff options
author | Povilas Kanapickas <povilas.kanapickas@gmail.com> | 2010-10-18 19:37:48 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-18 19:38:00 +0100 |
commit | bc8fcf207ffeee1dd6fb4a361b0ad5c5def21beb (patch) | |
tree | 43f54910146344613e641bd0b54cee3069292624 /svx | |
parent | 34f1c06830ae530bea4f11aca91e2836a53fd764 (diff) |
remove non-compiled code
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/colrctrl.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/contdlg.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/fillctrl.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/fntctl.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/fntszctl.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/graphctl.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/ruler.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/svdetc.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/svdmodel.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/svdpage.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/framelink.cxx | 38 | ||||
-rw-r--r-- | svx/source/items/numfmtsh.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdedtv1.cxx | 14 |
13 files changed, 0 insertions, 81 deletions
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index e6908d98c152..7b07a04da7a9 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -109,7 +109,6 @@ private: Size aColorSize; Size aItemSize; -//#if 0 // _SOLAR__PRIVATE void FillValueSet(); void SetSize(); DECL_LINK( SelectHdl, void * ); @@ -119,7 +118,6 @@ private: the keyboard. */ virtual void GetFocus (void); -//#endif protected: virtual BOOL Close(); diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index 034ec5485536..ad1d5b07d9be 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -90,14 +90,11 @@ class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow SvxSuperContourDlg* pSuperClass; -//#if 0 // _SOLAR__PRIVATE protected: void SetSuperClass( SvxSuperContourDlg& rSuperClass ) { pSuperClass = &rSuperClass; } -//#endif // __PRIVATE - public: SvxContourDlg( SfxBindings *pBindings, SfxChildWindow *pCW, diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 51ee743ca093..4cbce39bd4f8 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -91,11 +91,9 @@ private: Size aLogicalAttrSize; Timer aDelayTimer; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( DelayHdl, Timer * ); DECL_LINK( SelectFillTypeHdl, ListBox * ); DECL_LINK( SelectFillAttrHdl, ListBox * ); -//#endif virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: FillControl( Window* pParent, WinBits nStyle = 0 ); diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index f28e158df1df..30761b3f3994 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -46,13 +46,11 @@ private: FontNameMenu* pMenu; Menu& rParent; -//#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); -//#endif public: SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& ); diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index dfeec808e602..76fccbec4997 100644 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -46,9 +46,7 @@ private: Menu& rParent; SfxStatusForwarder aFontNameForwarder; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( MenuSelect, FontSizeMenu * ); -//#endif protected: virtual void StateChanged( USHORT nSID, SfxItemState eState, diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index f71f7fe6c43c..f544bf5bdecb 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -140,7 +140,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -//#if 0 // _SOLAR__PRIVATE /************************************************************************* |* @@ -187,7 +186,5 @@ public: virtual ~GraphCtrlView() {}; }; -//#endif // __PRIVATE - #endif // _GRAPHCTL_HXX diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index d27f3a079495..784caa5d4a80 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -99,7 +99,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener BOOL bValid; BOOL bListening; BOOL bActive; -//#if 0 // _SOLAR__PRIVATE void StartListening_Impl(); long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE ); void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE); @@ -194,7 +193,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener USHORT GetNextVisible(USHORT nColumn); USHORT GetPrevVisible(USHORT nColumn); -//#endif void Update(); diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index ffd3b1782004..8fde823a4816 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -144,9 +144,7 @@ class ContainerSorter { protected: Container& rCont; private: -//#if 0 // _SOLAR__PRIVATE void ImpSubSort(long nL, long nR) const; -//#endif // __PRIVATE public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const; @@ -166,7 +164,6 @@ virtual //////////////////////////////////////////////////////////////////////////////////////////////////// -//#if 0 // _SOLAR__PRIVATE #define SDRHDC_SAVEPEN 1 /* Save Linecolor */ #define SDRHDC_SAVEBRUSH 2 /* Save Fillcolorn */ #define SDRHDC_SAVEFONT 4 /* Save Font */ @@ -190,7 +187,6 @@ public: bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const; }; -//#endif // __PRIVATE //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 8f79bdb1f007..7c1922e15c38 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -311,7 +311,6 @@ private: SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel); SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel); SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const; -//#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE ); @@ -321,16 +320,13 @@ private: SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts = true); -//#endif // __PRIVATE // this is a weak reference to a possible living api wrapper for this model ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoModel; public: -//#if 0 // _SOLAR__PRIVATE bool IsPasteResize() const { return bPasteResize; } void SetPasteResize(bool bOn) { bPasteResize=bOn; } -//#endif // __PRIVATE TYPEINFO(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch // Aktionen an ihm vornehmen (Put(),Remove()). Bei Zerstoerung von diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index 6f7347998a40..27faec52859e 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -519,10 +519,8 @@ public: void TRG_SetMasterPageVisibleLayers(const SetOfByte& rNew); sdr::contact::ViewContact& TRG_GetMasterPageDescriptorViewContact() const; -//#if 0 // _SOLAR__PRIVATE protected: void TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage); -//#endif // __PRIVATE public: // Aenderungen an den Layern setzen nicht das Modified-Flag ! diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index f80e02e8d526..9a7f9b09e25e 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -613,44 +613,6 @@ void lclLinkVerFrameBorder( // ============================================================================ -#if 0 -// Not used anymore, but not deleted for possible future usage. - -/** Returns the relative Y offset of the intercept point of 2 diagonal borders. - - @param nTLBROffs - Width offset (sub units) across the top-left to bottom-right frame border. - @param fTLBRAngle - Inner angle between horizontal and top-left to bottom-right frame border. - @param nBLTROffs - Width offset (sub units) across the bottom-left to top-right frame border. - @param fBLTRAngle - Inner angle between horizontal and bottom-left to top-right frame border. - @return - Offset (sub units) relative to the Y position of the centered intercept - point of both diagonal frame borders. - */ -long lclGetDiagDiagOffset( long nTLBROffs, double fTLBRAngle, long nBLTROffs, double fBLTRAngle ) -{ - double fASin = sin( fTLBRAngle ); - double fACos = cos( fTLBRAngle ); - double fAX = -nTLBROffs * fASin; - double fAY = nTLBROffs * fACos; - double fRAX = fACos; - double fRAY = fASin; - - double fBSin = sin( fBLTRAngle ); - double fBCos = cos( fBLTRAngle ); - double fBX = nBLTROffs * fBSin; - double fBY = nBLTROffs * fBCos; - double fRBX = fBCos; - double fRBY = -fBSin; - - double fKA = (fRBX * (fBY - fAY) - fRBY * (fBX - fAX)) / (fRBX * fRAY - fRAX * fRBY); - return lclD2L( fAY + fKA * fRAY ); -} -#endif - // ---------------------------------------------------------------------------- // Linking of diagonal frame borders. diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 27f5135d242f..2d24e8f88525 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1605,9 +1605,6 @@ void SvxNumberFormatShell::GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bF aStr += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[i]->GetLanguage())); pStr = new XubString(aStr); -#if 0 - fprintf( stderr, "currency entry: %s\n", ByteString( *pStr, RTL_TEXTENCODING_UTF8).GetBuffer()); -#endif for(j=nStart;j<rList.Count();j++) { const StringPtr pTestStr=rList[j]; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index beafe24c1579..2acea4be6b69 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1537,20 +1537,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // linear combination will not decompose to the same start values again, but to a // new combination. Thus it makes no sense to check if the wanted shear is reached // or not. Taking out. -#if 0 - long nTempAngle=GetMarkedObjShear(); - if (nTempAngle!=0 && nTempAngle!=nNewShearAngle && !bShearVert) { - // noch eine 2. Iteration zur Kompensation der Rundungsfehler - double nOld=tan((double)nTempAngle*nPi180); - double nNew=tan((double)nNewShearAngle*nPi180); - nNew-=nOld; - nNew=atan(nNew)/nPi180; - nTempAngle=Round(nNew); - if (nTempAngle!=0) { - ShearMarkedObj(aRef,nTempAngle,bShearVert); - } - } -#endif } // Position aendern |