summaryrefslogtreecommitdiff
path: root/svx
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
commit6a007ed1754b45ab00c3021dc3724edea53f1ed1 (patch)
tree96944dc9fb6158d90ae57a2c2778090cdc3c7f3e /svx
parentba0251a0767b802b20e4f017005d0752add77607 (diff)
remove non-compiled code
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/colrctrl.hxx2
-rw-r--r--svx/inc/svx/contdlg.hxx3
-rw-r--r--svx/inc/svx/fillctrl.hxx2
-rw-r--r--svx/inc/svx/fntctl.hxx2
-rw-r--r--svx/inc/svx/fntszctl.hxx2
-rw-r--r--svx/inc/svx/graphctl.hxx3
-rw-r--r--svx/inc/svx/ruler.hxx2
-rw-r--r--svx/inc/svx/svdetc.hxx4
-rw-r--r--svx/inc/svx/svdmodel.hxx4
-rw-r--r--svx/inc/svx/svdpage.hxx2
-rw-r--r--svx/source/dialog/framelink.cxx38
-rw-r--r--svx/source/items/numfmtsh.cxx3
-rw-r--r--svx/source/svdraw/svdedtv1.cxx14
13 files changed, 0 insertions, 81 deletions
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 5ffcab526d..20981d9494 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 17c31d6d5e..26034741cf 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 1e2bcc5fab..32b15d4c3b 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 5ba448e344..bf1125bc95 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 5b46d28ab5..ff074cc0f9 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 ade161ab2c..ef01eea17c 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 b82213e69a..5b338a9d91 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 87aa5cd0f8..36a788c515 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 950b7dc7cc..f7633bf6ae 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 a9ceeb994b..57e8821252 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 17b688f970..6074b40ba2 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 69205cb6de..d6a2f3a369 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 42a6ee2b94..c545c3c4c6 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