diff options
| -rwxr-xr-x | compilerplugins/clang/unusedfields.py | 3 | ||||
| -rw-r--r-- | include/sot/object.hxx | 1 | ||||
| -rw-r--r-- | include/svl/filerec.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/ruler.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/treelistbox.hxx | 1 | ||||
| -rw-r--r-- | sot/source/base/object.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/control/ruler.cxx | 22 |
7 files changed, 13 insertions, 19 deletions
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py index 7fc6d4aeb2e4..47488887c4bb 100755 --- a/compilerplugins/clang/unusedfields.py +++ b/compilerplugins/clang/unusedfields.py @@ -67,7 +67,8 @@ for d in definitionSet: or srcLoc.startswith("vcl/source/filter/sgvmain.hxx") or srcLoc.startswith("vcl/source/filter/sgfbram.hxx") or srcLoc.startswith("vcl/inc/unx/XIM.h") - or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")): + or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h") + or srcLoc.startswith("include/svl/svdde.hxx")): continue tmp1set.add((clazz + " " + definitionToTypeMap[d], srcLoc)) diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 6699d925e0d2..f2c3b24490f6 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -30,7 +30,6 @@ class SOT_DLLPUBLIC SotObject : virtual public SvRefBase friend class SotFactory; sal_uInt16 nOwnerLockCount; bool bOwner; - bool bSVObject; // is proxy, then TRUE if other side is SV bool bInClose; // TRUE, in DoClose protected: diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index bf92859b07c5..da9ac358f1f6 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -313,13 +313,11 @@ class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader { protected: sal_uInt16 _nRecordTag; // type of the complete contents - sal_uInt8 _nRecordVer; // version of the complete contents sal_uInt8 _nRecordType; // Record Type from the header // Three phase constructor for derived classes SfxSingleRecordReader() : _nRecordTag(0) - , _nRecordVer(0) , _nRecordType(0) { } diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 5e2ee847c89c..c53e567cc6d0 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -573,8 +573,6 @@ struct RulerUnitData double nTick2; // Tick quarter unit double nTick3; // Tick half unit double nTick4; // Tick whole unit - long n100THMM; // 100mm Unit divider - sal_uInt16 nUnitDigits; // Number of digits sal_Char aUnitStr[8]; // Unit string }; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index ed52d9eeb952..1a8d7415c184 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -259,7 +259,6 @@ class SVT_DLLPUBLIC SvTreeListBox bool mbUpdateAlternatingRows; SvTreeListEntry* pHdlEntry; - SvLBoxItem* pHdlItem; DragDropMode nDragDropMode; DragDropMode nOldDragMode; diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 9f39e035736f..11802528f2c2 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -58,7 +58,6 @@ void * SotObject::Cast( const SotFactory * pFact ) SotObject::SotObject() : nOwnerLockCount( 0 ) , bOwner ( true ) - , bSVObject ( false ) , bInClose ( false ) { SotFactory::IncSvObjectCount( this ); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index b48f1e84f6fd..1a2d257caf58 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -179,17 +179,17 @@ ImplRulerData& ImplRulerData::operator=( const ImplRulerData& rData ) static const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] = { -{ MAP_100TH_MM, 100, 25.0, 25.0, 50.0, 100.0, 100, 3, " mm" }, // MM -{ MAP_100TH_MM, 1000, 100.0, 500.0, 1000.0, 1000.0, 1000, 3, " cm" }, // CM -{ MAP_MM, 1000, 10.0, 250.0, 500.0, 1000.0, 10000, 4, " m" }, // M -{ MAP_CM, 100000, 12500.0, 25000.0, 50000.0, 100000.0, 100000, 6, " km" }, // KM -{ MAP_1000TH_INCH, 1000, 62.5, 125.0, 500.0, 1000.0, 25400, 3, "\"" }, // INCH -{ MAP_100TH_INCH, 1200, 120.0, 120.0, 600.0, 1200.0, 30480, 3, "'" }, // FOOT -{ MAP_10TH_INCH, 633600, 63360.0, 63360.0, 316800.0, 633600.0, 1609344, 4, " miles" }, // MILE -{ MAP_POINT, 1, 12.0, 12.0, 12.0, 36.0, 353, 2, " pt" }, // POINT -{ MAP_100TH_MM, 423, 423.0, 423.0, 423.0, 846.0, 423, 3, " pi" }, // PICA -{ MAP_100TH_MM, 371, 371.0, 371.0, 371.0, 743.0, 371, 3, " ch" }, // CHAR -{ MAP_100TH_MM, 551, 551.0, 551.0, 551.0, 1102.0, 551, 3, " li" } // LINE +{ MAP_100TH_MM, 100, 25.0, 25.0, 50.0, 100.0, " mm" }, // MM +{ MAP_100TH_MM, 1000, 100.0, 500.0, 1000.0, 1000.0, " cm" }, // CM +{ MAP_MM, 1000, 10.0, 250.0, 500.0, 1000.0, " m" }, // M +{ MAP_CM, 100000, 12500.0, 25000.0, 50000.0, 100000.0, " km" }, // KM +{ MAP_1000TH_INCH, 1000, 62.5, 125.0, 500.0, 1000.0, "\"" }, // INCH +{ MAP_100TH_INCH, 1200, 120.0, 120.0, 600.0, 1200.0, "'" }, // FOOT +{ MAP_10TH_INCH, 633600, 63360.0, 63360.0, 316800.0, 633600.0, " miles" }, // MILE +{ MAP_POINT, 1, 12.0, 12.0, 12.0, 36.0, " pt" }, // POINT +{ MAP_100TH_MM, 423, 423.0, 423.0, 423.0, 846.0, " pi" }, // PICA +{ MAP_100TH_MM, 371, 371.0, 371.0, 371.0, 743.0, " ch" }, // CHAR +{ MAP_100TH_MM, 551, 551.0, 551.0, 551.0, 1102.0, " li" } // LINE }; static RulerTabData ruler_tab = |