[Libreoffice-commits] .: 2 commits - sw/source

[Takeshi Abe]

 sw/source/core/attr/cellatr.cxx                  |    2 --
 sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx |    2 +-
 sw/source/core/doc/docbm.cxx                     |    4 ++--
 sw/source/ui/config/caption.cxx                  |    4 ----
 sw/source/ui/lingu/hyp.cxx                       |    4 ----
 sw/source/ui/shells/textsh1.cxx                  |   22 ----------------------
 6 files changed, 3 insertions(+), 35 deletions(-)

New commits:
commit 199d83a44d07eeed1ffb27ad2a2f3ba5e40a0491
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Sep 28 13:47:45 2011 +0900

    removed dead code

diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index abd2dfd..d2b566d 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -43,8 +43,6 @@
 #include <switerator.hxx>
 
 
-//TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
-
 /*************************************************************************
 |*
 *************************************************************************/
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 405a976..e24262f 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -29,15 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <osl/diagnose.h>
 
 #include "numrule.hxx"
 #include "caption.hxx"
 
-#define VERSION_01      1
-#define CAPTION_VERSION VERSION_01
-
 InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) :
     bUseCaption(sal_False),
     eObjType(eType),
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index 2795507..26c0276 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-
 #include "initui.hxx"
 #include "view.hxx"
 #include "edtwin.hxx"
@@ -42,14 +40,12 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <swwait.hxx>
 
-
 #include "hyp.hxx"
 #include "mdiexp.hxx"
 #include "olmenu.hrc"
 
 #include <unomid.h>
 
-#define HYPHHERE    '-'
 #define PSH         (&pView->GetWrtShell())
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 7ccc72d..55a268e 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1480,29 +1480,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
         case FN_INSERT_PAGEHEADER:
         case FN_INSERT_PAGEFOOTER:
             {
-#ifndef CHECK_MENU
                 rSet.Put( SfxObjectShellItem( nWhich, GetView().GetDocShell() ));
-#else
-                // Seitenvorlagen besorgen
-                sal_Bool bFound = sal_False;
-                sal_uInt16 n, nCnt = rSh.GetPageDescCnt();
-                for( n = 0; n < nCnt; ++n )
-                {
-                    const SwPageDesc& rDesc = rSh.GetPageDesc( n );
-                    if( FN_INSERT_PAGEHEADER == nWhich
-                        ? !rDesc.GetMaster().GetHeader().IsActive()
-                        : !rDesc.GetMaster().GetFooter().IsActive() )
-                    {
-                        bFound = sal_True;
-                        break;
-                    }
-                }
-
-                if( bFound )
-                    rSet.Put( SfxObjectShellItem( nWhich, GetView().GetDocShell() ));
-                else
-                    rSet.DisableItem( nWhich );
-#endif
             }
             break;
             case FN_TABLE_SORT_DIALOG:
commit a80533c4a787e30973316778d482b0245815fac9
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Sep 28 00:14:05 2011 +0900

    fix typo in message

diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index c228387..fdd9c5a 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -122,7 +122,7 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId
         }
         break;
         default:
-            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
             bRet = false;
     }
 
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index a867f99..27c2211 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -481,7 +481,7 @@ namespace sw { namespace mark
     bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName)
     {
         OSL_PRECOND(io_pMark->GetMarkPos().GetDoc() == m_pDoc,
-            "<MarkManager::repositionMark(..)>"
+            "<MarkManager::renameMark(..)>"
             " - Mark is not in my doc.");
         if(io_pMark->GetName() == rNewName)
             return true;
@@ -748,7 +748,7 @@ namespace sw { namespace mark
     void MarkManager::deleteMark(const IMark* const pMark)
     {
         OSL_PRECOND(pMark->GetMarkPos().GetDoc() == m_pDoc,
-            "<MarkManager::repositionMark(..)>"
+            "<MarkManager::deleteMark(..)>"
             " - Mark is not in my doc.");
         // finds the last Mark that is starting before pMark
         // (pMarkLow < pMark)