sw/source/core/doc/docxforms.cxx | 1
sw/source/core/doc/poolfmt.cxx | 94 ------------------------------------
sw/source/core/inc/GetMetricVal.hxx | 6 --
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/ui/shells/annotsh.cxx | 1
sw/source/ui/shells/drawsh.cxx | 1
sw/source/ui/shells/drwtxtex.cxx | 1
sw/source/ui/shells/frmsh.cxx | 1
sw/source/ui/shells/textsh1.cxx | 1
sw/source/ui/vba/vbasystem.cxx | 1
10 files changed, 1 insertion(+), 108 deletions(-)
New commits:
commit 3df9adb1b0031e77977431c90edee651b2aaa195
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Sun Jan 5 04:21:57 2014 +0100
remove broken DBG_UNHANDLED_EXCEPTION macro crap
this breaks quickly doing a `make sw debug=T` hard, with e.g.
sw/source/ui/vba/vbasystem.cxx:239: undefined reference to
`DbgUnhandledException(com::sun::star::uno::Any const&, char const*, char
const*)'
fix this for --disable-dbgutl builds too before reverting this commit.
Change-Id: Ie54d63ea11b4e36c737b22099027711ad0435acc
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index 793d721..82a6946 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -90,7 +90,6 @@ void SwDoc::initXForms( bool bCreateDefaultModel )
}
catch( const Exception& )
{
- DBG_UNHANDLED_EXCEPTION();
}
}
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 96b0722..23eb813 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -915,7 +915,6 @@ void SwXMLImport::endDocument( void )
}
catch( const Exception& )
{
- DBG_UNHANDLED_EXCEPTION();
}
}
}
@@ -1484,7 +1483,6 @@ void SwXMLImport::SetDocumentSpecificSettings(
}
catch( const Exception& )
{
- DBG_UNHANDLED_EXCEPTION();
}
}
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 6f1b45d..60c8c5c 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -438,7 +438,6 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
}
catch (const uno::Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
}
rReq.Ignore ();
}
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 9ee7a70..c3d3120 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -213,7 +213,6 @@ void SwDrawShell::Execute(SfxRequest &rReq)
}
catch (const uno::Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
}
rReq.Ignore ();
}
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 56f4184..761e507 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -375,7 +375,6 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
}
catch (const uno::Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
}
rReq.Ignore ();
}
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 8ffa207..dedc996 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -262,7 +262,6 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
catch (const uno::Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
}
rReq.Ignore ();
}
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 9868653..2a97cdb 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1303,7 +1303,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
catch (const uno::Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
}
rReq.Ignore ();
}
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 9af1dbb..94757da 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -236,7 +236,6 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw
(uno::RuntimeException)
}
catch( const uno::Exception& )
{
- DBG_UNHANDLED_EXCEPTION();
}
}
commit d6bc2204e81fecccfb56517b34d67a0522eeae0d
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Sun Jan 5 03:47:36 2014 +0100
ancient USE_MEASUREMENT define is never set
Change-Id: Ib5c1001c08ac194367c211506416abaee1f156c8
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 55f5012..72a94ec 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1707,18 +1707,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
- };
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
const sal_uInt16* pArr = aAbsSpace;
-#endif
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -1756,21 +1745,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
1588, 1758 // 2.80, 3.10
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 385, 385, 770, 963,
- 1155, 1386, 1771, 2002,
- 2156, 2387
- };
-
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
const sal_uInt16* pArr = aAbsSpace;
-#endif
SwNumFmt aFmt;
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
@@ -1856,18 +1831,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
- };
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
const sal_uInt16* pArr = aAbsSpace;
-#endif
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -1907,20 +1871,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
255, 879 // 0.45, 1.55
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch0to2[] =
- {
- 308, 308,
- 501, 847,
- 347, 1194
- };
- const sal_uInt16* pArr0to2 = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace0to2
- : aAbsSpaceInch0to2;
-#else
const sal_uInt16* pArr0to2 = aAbsSpace0to2;
-#endif
SwNumFmt aFmt;
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
@@ -2038,18 +1989,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
- };
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
const sal_uInt16* pArr = aAbsSpace;
-#endif
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2094,18 +2034,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// cm: 0,3 0,6 0,9 1,2 1,5 1,8 2,1 2,4 2,7 3,0
170, 340, 510, 680, 850, 1020, 1191, 1361, 1531, 1701
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 170, 340, 510, 680, 850, 1020, 1191, 1361, 1531, 1701
- };
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
const sal_uInt16* pArr = aAbsSpace;
-#endif
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2191,18 +2120,8 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
- };
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
+
const sal_uInt16* pArr = aAbsSpace;
-#endif
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2254,18 +2173,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
};
-#ifdef USE_MEASUREMENT
- static const sal_uInt16 aAbsSpaceInch[ MAXLEVEL ] =
- {
- 227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
- };
- const sal_uInt16* pArr = MEASURE_METRIC ==
-
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? aAbsSpace
- : aAbsSpaceInch;
-#else
const sal_uInt16* pArr = aAbsSpace;
-#endif
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
diff --git a/sw/source/core/inc/GetMetricVal.hxx
b/sw/source/core/inc/GetMetricVal.hxx
index e7a85a8..eca6b9e 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricVal.hxx
@@ -28,13 +28,7 @@
inline sal_uInt16 GetMetricVal( int n )
{
-#ifdef USE_MEASUREMENT
- sal_uInt16 nVal = MEASURE_METRIC ==
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? 567 // 1 cm
- : 770; // 1/2 Inch
-#else
sal_uInt16 nVal = 567; // 1 cm
-#endif
if( CM_01 == n )
nVal /= 10;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
