[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Sep 13 21:06:13 PDT 2011
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 9 +--------
binfilter/bf_sd/source/ui/inc/optsitem.hxx | 2 +-
binfilter/bf_svx/source/dialog/svx_dlgutil.cxx | 13 -------------
binfilter/bf_svx/source/dialog/svx_rulritem.cxx | 9 +--------
binfilter/bf_svx/source/items/svx_textitem.cxx | 3 +--
binfilter/inc/bf_svx/dlgutil.hxx | 6 ------
binfilter/inc/bf_svx/rulritem.hxx | 2 +-
7 files changed, 5 insertions(+), 39 deletions(-)
New commits:
commit 295520646736ab372347b1f9e3c2585920af6452
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Sep 13 20:39:16 2011 -0700
Cleanup DBG_BF_ASSERT() in svx_dialog classes
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 0c574ed..08d1942 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -155,7 +155,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) :
SetSwapGraphics(TRUE);
}
- SetUIUnit( GetModuleFieldUnit(), Fraction( 1, 1 ) ); // default
+ SetUIUnit( FUNIT_INCH, Fraction( 1, 1 ) ); // default
SetScaleUnit(MAP_100TH_MM);
SetScaleFraction(Fraction(1, 1));
@@ -195,13 +195,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) :
mpLocale = new ::com::sun::star::lang::Locale( MsLangId::convertLanguageToLocale( eRealLanguage ));
mpCharClass = new CharClass( *mpLocale );
- // If the current application language is a language that uses right-to-left text...
- LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguage();
- if( MsLangId::isRightToLeft( eRealCTLLanguage ) )
- {
- DBG_BF_ASSERT(0, "STRIP");
- }
-
SetDefaultTabulator( 1250 );
rOutliner.SetDefaultLanguage( Application::GetSettings().GetLanguage() );
diff --git a/binfilter/bf_sd/source/ui/inc/optsitem.hxx b/binfilter/bf_sd/source/ui/inc/optsitem.hxx
index 55c4b95..eeb3e30 100644
--- a/binfilter/bf_sd/source/ui/inc/optsitem.hxx
+++ b/binfilter/bf_sd/source/ui/inc/optsitem.hxx
@@ -164,7 +164,7 @@ public:
BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; }
BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; }
BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; }
- UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)GetModuleFieldUnit() : nMetric ); }
+ UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? FUNIT_INCH : nMetric ); }
UINT16 GetDefTab() const { Init(); return nDefTab; }
void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } }
diff --git a/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx b/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx
index f9b1d03..7951455 100644
--- a/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx
+++ b/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx
@@ -35,12 +35,6 @@
#include "dlgutil.hxx"
namespace binfilter {
-/*N*/ FieldUnit GetModuleFieldUnit( const SfxItemSet* /*pSet*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ FieldUnit eUnit = FUNIT_INCH;
-/*N*/ return eUnit;
-/*N*/ }
-
// -----------------------------------------------------------------------
/*N*/ long CalcToUnit( float nIn, SfxMapUnit eUnit )
@@ -75,13 +69,6 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*?*/ long ItemToControl( long, SfxMapUnit, SfxFieldUnit )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor )
/*N*/ {
/*N*/ DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP ||
diff --git a/binfilter/bf_svx/source/dialog/svx_rulritem.cxx b/binfilter/bf_svx/source/dialog/svx_rulritem.cxx
index e7051c8..d001abf 100644
--- a/binfilter/bf_svx/source/dialog/svx_rulritem.cxx
+++ b/binfilter/bf_svx/source/dialog/svx_rulritem.cxx
@@ -157,13 +157,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool *pPool ) const
/*N*/ {
/*N*/ return new SvxColumnItem(*this);
@@ -222,7 +215,7 @@ namespace binfilter {
/*N*/ nEndY ( nEY ),
/*N*/ bLimits ( limits )
/*N*/
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
+/*N*/ {
/*N*/ }
}
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 4e2d3d1..3bbfa98 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -813,8 +813,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/
/*N*/ #ifndef SVX_LIGHT
/*N*/ if( SFX_MAPUNIT_RELATIVE != eUnit )
-nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
-/*N*/ SFX_FUNIT_TWIP );
+ nHeight = nNewHeight + 0;
/*N*/ else
/*N*/ #endif // !SVX_LIGHT
/*N*/ if( 100 != nNewProp )
diff --git a/binfilter/inc/bf_svx/dlgutil.hxx b/binfilter/inc/bf_svx/dlgutil.hxx
index c2d28cd..e8dbadd 100644
--- a/binfilter/inc/bf_svx/dlgutil.hxx
+++ b/binfilter/inc/bf_svx/dlgutil.hxx
@@ -33,15 +33,9 @@
#include <bf_svtools/intitem.hxx>
namespace binfilter {
-// Functions -------------------------------------------------------------
-
-// FieldUnit im MetricField oder -Box umsetzen
-FieldUnit GetModuleFieldUnit( const SfxItemSet* pSet = NULL );
-
// Metriken umrechnen
long CalcToUnit( float nIn, SfxMapUnit eUnit );
long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
-long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT)
diff --git a/binfilter/inc/bf_svx/rulritem.hxx b/binfilter/inc/bf_svx/rulritem.hxx
index cb6be86..12ccdcd 100644
--- a/binfilter/inc/bf_svx/rulritem.hxx
+++ b/binfilter/inc/bf_svx/rulritem.hxx
@@ -158,7 +158,7 @@ class SvxColumnItem : public SfxPoolItem
void DeleteAndDestroyColumns();
protected:
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const { return TRUE; }
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
More information about the Libreoffice-commits
mailing list