callcatcher: dropping SwChapterNumRules binary Load/Store has knock-on effect

Change-Id: I2567026af23dd5fc42812b90bd6098c4c74a4f92

14 files changed, 10 insertions, 46 deletions

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 5a6a21fac06c..39bbf43c262d 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -156,7 +156,6 @@ SvxNumberFormat::SvxNumberFormat( sal_Int16 eType,
       mePositionAndSpaceMode( ePositionAndSpaceMode ),
       nFirstLineOffset(0),
       nAbsLSpace(0),
-      nLSpace(0),
       nCharTextDistance(0),
       meLabelFollowedBy( LISTTAB ),
       mnListtabPos( 0 ),
@@ -182,7 +181,6 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
     , nBulletRelSize(100)
     , nFirstLineOffset(0)
     , nAbsLSpace(0)
-    , nLSpace(0)
     , nCharTextDistance(0)
 {
     sal_uInt16 nTmp16(0);
@@ -197,7 +195,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
 
     rStream.ReadInt16( nFirstLineOffset );
     rStream.ReadInt16( nAbsLSpace );
-    rStream.ReadInt16( nLSpace );
+    rStream.SeekRel(2); //skip old now unused nLSpace;
 
     rStream.ReadInt16( nCharTextDistance );
 
@@ -261,7 +259,7 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
 
     rStream.WriteInt16( nFirstLineOffset );
     rStream.WriteInt16( nAbsLSpace );
-    rStream.WriteInt16( nLSpace );
+    rStream.WriteInt16( 0 ); // write a dummy for old now unused nLSpace
 
     rStream.WriteInt16( nCharTextDistance );
     rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
@@ -323,7 +321,6 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
         mePositionAndSpaceMode = rFormat.mePositionAndSpaceMode;
         nFirstLineOffset    = rFormat.nFirstLineOffset;
         nAbsLSpace          = rFormat.nAbsLSpace ;
-        nLSpace             = rFormat.nLSpace ;
         nCharTextDistance   = rFormat.nCharTextDistance ;
         meLabelFollowedBy = rFormat.meLabelFollowedBy;
         mnListtabPos = rFormat.mnListtabPos;
@@ -359,7 +356,6 @@ bool  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
         mePositionAndSpaceMode != rFormat.mePositionAndSpaceMode ||
         nFirstLineOffset    != rFormat.nFirstLineOffset ||
         nAbsLSpace          != rFormat.nAbsLSpace ||
-        nLSpace             != rFormat.nLSpace ||
         nCharTextDistance   != rFormat.nCharTextDistance ||
         meLabelFollowedBy != rFormat.meLabelFollowedBy ||
         mnListtabPos != rFormat.mnListtabPos ||
@@ -454,10 +450,6 @@ void SvxNumberFormat::SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePosit
     mePositionAndSpaceMode = ePositionAndSpaceMode;
 }
 
-short SvxNumberFormat::GetLSpace() const
-{
-    return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION ? nLSpace : 0;
-}
 short SvxNumberFormat::GetAbsLSpace() const
 {
     return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
@@ -604,7 +596,6 @@ SvxNumRule::SvxNumRule( sal_uLong nFeatures,
                 if ( eDefaultNumberFormatPositionAndSpaceMode ==
                                     SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmts[i]->SetLSpace( convertMm100ToTwip(DEF_WRITER_LSPACE) );
                     aFmts[i]->SetAbsLSpace( convertMm100ToTwip(DEF_WRITER_LSPACE * (i+1)) );
                     aFmts[i]->SetFirstLineOffset(convertMm100ToTwip(-DEF_WRITER_LSPACE));
                 }
@@ -626,7 +617,6 @@ SvxNumRule::SvxNumRule( sal_uLong nFeatures,
             }
             else
             {
-                aFmts[i]->SetLSpace( DEF_DRAW_LSPACE );
                 aFmts[i]->SetAbsLSpace( DEF_DRAW_LSPACE * (i) );
             }
         }
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index e570bba424b1..944514f192eb 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6033,7 +6033,6 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >&
             {
                 if ( aNumberFormat.GetNumberingType() == SVX_NUM_NUMBER_NONE )
                 {
-                    aNumberFormat.SetLSpace( 0 );
                     aNumberFormat.SetAbsLSpace( 0 );
                     aNumberFormat.SetFirstLineOffset( 0 );
                     aNumberFormat.SetCharTextDistance( 0 );
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 3b24d564736d..37c9f4ad43c0 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -118,8 +118,8 @@ private:
     Color               nBulletColor;       // Bullet color
 
     // mode indicating, if the position and spacing of the list label is
-    // determined by the former attributes (nFirstLineOffset, nAbsLSpace,
-    // nLSpace and nCharTextDistance) called position and spacing via label
+    // determined by the former attributes (nFirstLineOffset, nAbsLSpace
+    // and nCharTextDistance) called position and spacing via label
     // width and position (LABEL_WIDTH_AND_POSITION) or by the new attributes
     // (meLabelFollowedBy, mnListtabPos, mnFirstLineIndent and mnIndentAt)
     // called position and spacing via label alignment.
@@ -130,7 +130,6 @@ private:
 
     short               nFirstLineOffset;   // First line indent
     short               nAbsLSpace;         // Distance Border<->Number
-    short               nLSpace;            // relative to the previous indentation
     short               nCharTextDistance;  // Distance Number<->Text
 
     // specifies what follows the list label before the text of the first line
@@ -202,8 +201,6 @@ public:
     SvxNumPositionAndSpaceMode GetPositionAndSpaceMode() const { return mePositionAndSpaceMode;}
     void SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode );
 
-    void            SetLSpace(short nSet) {nLSpace = nSet;}
-    short           GetLSpace() const;
     void            SetAbsLSpace(short nSet) {nAbsLSpace = nSet;}
     short           GetAbsLSpace() const;
     void            SetFirstLineOffset(short nSet) { nFirstLineOffset = nSet;}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 1c8a296b7511..a081fa036c77 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1224,7 +1224,6 @@ void SdDrawDocument::SetTextDefaults() const
 
     SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false);
 
-    //aNumberFormat.SetLSpace( 0 );
     //aNumberFormat.SetAbsLSpace( 0 );
     //aNumberFormat.SetFirstLineOffset( 0 );
     //aNumRule.SetLevel( 0, aNumberFormat );
@@ -1232,7 +1231,6 @@ void SdDrawDocument::SetTextDefaults() const
     for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
     {
         const short nLSpace = (i + 1) * 600;
-        aNumberFormat.SetLSpace(nLSpace);
         aNumberFormat.SetAbsLSpace(nLSpace);
         aNumberFormat.SetFirstLineOffset(-600);
         aNumRule.SetLevel( i, aNumberFormat );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 512df9c78e3e..cdd1aee7ad6f 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1051,7 +1051,6 @@ void SdStyleSheetPool::setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i
     rNumberFormat.SetBulletChar( 0x25CF );  // StarBats: 0xF000 + 34
     rNumberFormat.SetBulletRelSize(45);
     const short nLSpace = (i + 1) * 1200;
-    rNumberFormat.SetLSpace(nLSpace);
     rNumberFormat.SetAbsLSpace(nLSpace);
     short nFirstLineOffset = -600;
 
@@ -1114,7 +1113,6 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
             for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
             {
                 const short nLSpace = (i + 1) * 600;
-                aNumberFormat.SetLSpace(nLSpace);
                 aNumberFormat.SetAbsLSpace(nLSpace);
                 aNumberFormat.SetFirstLineOffset(-600);
                 aNumRule.SetLevel( i, aNumberFormat );
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 2cf2594be488..c38924b1d378 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -371,7 +371,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
                                 else
                                 {
                                     aFmt.SetNumberingType(SVX_NUM_NUMBER_NONE);
-                                    aFmt.SetLSpace(0);
                                     aFmt.SetAbsLSpace(0);
                                     aFmt.SetFirstLineOffset(0);
                                 }
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index ca2c2dc193ad..e73f6bd22cf3 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -319,9 +319,6 @@ public:
     typedef std::multimap< SwNodeIndex, SwFrmFmt* >::const_iterator const_iterator;
     typedef std::pair< const_iterator, const_iterator > const_iterator_pair;
     const_iterator_pair equal_range( const SwNodeIndex& pos ) const;
-    const_iterator lower_bound( const SwNodeIndex& pos ) const;
-    const_iterator upper_bound( const SwNodeIndex& pos ) const;
-    const_iterator end() const;
 private:
     std::multimap< SwNodeIndex, SwFrmFmt* > items;
     const SwDoc* doc;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index fce040d6ca9c..5725862bbf94 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -408,7 +408,6 @@ SwNumRule::SwNumRule( const OUString& rNm,
             pFmt = new SwNumFmt;
             pFmt->SetIncludeUpperLevels( 1 );
             pFmt->SetStart( 1 );
-            pFmt->SetLSpace( lNumIndent );
             pFmt->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
             pFmt->SetFirstLineOffset( lNumFirstLineOffset );
             pFmt->SetSuffix( "." );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index d263dcfeaca1..54e710dc2454 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3369,19 +3369,4 @@ SwFrmFmtAnchorMap::const_iterator_pair SwFrmFmtAnchorMap::equal_range( const SwN
     return items.equal_range( pos );
 }
 
-SwFrmFmtAnchorMap::const_iterator SwFrmFmtAnchorMap::lower_bound( const SwNodeIndex& pos ) const
-{
-    return items.lower_bound( pos );
-}
-
-SwFrmFmtAnchorMap::const_iterator SwFrmFmtAnchorMap::upper_bound( const SwNodeIndex& pos ) const
-{
-    return items.upper_bound( pos );
-}
-
-SwFrmFmtAnchorMap::const_iterator SwFrmFmtAnchorMap::end() const
-{
-    return items.end();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index bb5efeb872d7..492c1d21ecc8 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -492,7 +492,6 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
         aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
         aNumFmt.SetBulletChar( cBulletChar );   // das Bulletzeichen !!
         aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) );
-        aNumFmt.SetLSpace( (sal_uInt16)(-HTML_NUMBUL_INDENT) );
         aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
         aNumRule.Set( 0, aNumFmt );
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0b46a67c44c7..2d10e4af87ec 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -612,7 +612,6 @@ static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, sal_uInt8 nSwLevel )
     if( rAV.aBits1 & 0x08 )      //fHang
     {
         rNum.SetFirstLineOffset( -nIndent );
-        rNum.SetLSpace( nIndent );
         rNum.SetAbsLSpace( nIndent );
     }
     else
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 6f4fafe0f174..79fa813b334a 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -161,7 +161,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
                     if ( n && bHtml )
                     {
                         // 1/2" for HTML
-                        aFmt.SetLSpace(720);
                         aFmt.SetAbsLSpace(n * 720);
                     }
                     // #i38904#  Default alignment for
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index aa58f59d2166..d670343b176a 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1234,7 +1234,6 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                 if(bHtml && nLvl)
                 {
                     // 1/2" for HTML
-                    aFmt.SetLSpace(720);
                     aFmt.SetAbsLSpace(nLvl * 720);
                 }
                 else if ( nWidthOfTabs > 0 )
diff --git a/unusedcode.easy b/unusedcode.easy
index 2eb975d17988..58bd4f8c9f44 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,8 +5,13 @@ GDriveDocument::GDriveDocument(GDriveSession*)
 GDriveFolder::GDriveFolder(GDriveSession*)
 GDriveProperty::GDriveProperty()
 GDriveSession::GDriveSession()
+ImpBitmap::ImplSetSalBitmap(SalBitmap*)
 OpenGLContext::renderToFile()
+OpenGLContext::requestSingleBufferedRendering()
+OpenGLContext::requestVirtualDevice()
 OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
+OpenGLSalBitmap::Draw(OpenGLContext&, SalTwoRect const&)
+OpenGLTexture::OpenGLTexture()
 OutputDevice::GetCanvas() const
 OutputDevice::HasAlpha()
 OutputDevice::LogicHeightToDeviceCoordinate(long) const
@@ -187,6 +192,7 @@ sc::CLBuildKernelThread::produce()
 sc::CellValues::transferTo(ScColumn&, int)
 sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
+sdr::contact::ViewContactOfTextObj::GetTextObj() const
 sfx2::SvBaseLink::SvBaseLink(rtl::OUString const&, unsigned short, sfx2::SvLinkSource*)
 std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
 std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)