[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Aug 31 03:03:11 PDT 2011
binfilter/bf_sc/source/core/data/sc_attrib.cxx | 41 -----
binfilter/bf_sc/source/filter/xml/makefile.mk | 2
binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx | 93 -----------
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 1
binfilter/bf_sc/source/ui/inc/viewdata.hxx | 1
binfilter/bf_sc/source/ui/view/sc_viewdata.cxx | 119 --------------
binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx | 13 -
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 1
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 51 ------
binfilter/bf_svtools/source/filerec/svt_filerec.cxx | 122 ---------------
binfilter/bf_svtools/source/misc1/svt_strmadpt.cxx | 24 --
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 9 -
binfilter/bf_svx/source/svdraw/svx_svdmark.cxx | 4
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 17 --
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 39 ----
binfilter/inc/bf_sc/xmlwrap.hxx | 65 -------
binfilter/inc/bf_sch/SchXMLWrapper.hxx | 77 ---------
binfilter/inc/bf_svtools/filerec.hxx | 91 -----------
binfilter/inc/bf_svx/editeng.hxx | 1
binfilter/inc/bf_svx/svdmark.hxx | 5
binfilter/inc/bf_svx/xoutx.hxx | 1
binfilter/inc/bf_sw/crsrsh.hxx | 2
binfilter/inc/bf_sw/viewsh.hxx | 30 ---
23 files changed, 6 insertions(+), 803 deletions(-)
New commits:
commit 61bfa7536211559894d6dd7e1db704d6da132375
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 23:33:04 2011 +0100
shrink further
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index ccaf3ce..d1cf0f1 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -798,47 +798,6 @@ using namespace ::com::sun::star;
/*N*/ return pItem;
/*N*/ }
-//------------------------------------------------------------------------
-
-/*N*/ class ScFieldChangerEditEngine : public ScEditEngineDefaulter
-/*N*/ {
-/*N*/ TypeId aExtFileId;
-/*N*/ USHORT nConvPara;
-/*N*/ xub_StrLen nConvPos;
-/*N*/ BOOL bConvert;
-/*N*/
-/*N*/ public:
-/*N*/ ScFieldChangerEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool );
-/*N*/ virtual ~ScFieldChangerEditEngine() {}
-/*N*/
-/*N*/ virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara,
-/*N*/ USHORT nPos, Color*& rTxtColor,
-/*N*/ Color*& rFldColor );
-/*N*/ };
-/*N*/
-/*N*/ ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pInEnginePool,
-/*N*/ BOOL bInDeleteEnginePool ) :
-/*N*/ ScEditEngineDefaulter( pInEnginePool, bInDeleteEnginePool ),
-/*N*/ aExtFileId( TYPE( SvxExtFileField ) ),
-/*N*/ nConvPara( 0 ),
-/*N*/ nConvPos( 0 ),
-/*N*/ bConvert( FALSE )
-/*N*/ {
-/*N*/ }
-/*N*/
-/*N*/ String ScFieldChangerEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-/*N*/ USHORT nPara, USHORT nPos, Color*& /*rTxtColor*/, Color*& /*rFldColor*/ )
-/*N*/ {
-/*N*/ const SvxFieldData* pFieldData = rField.GetField();
-/*N*/ if ( pFieldData && pFieldData->Type() == aExtFileId )
-/*N*/ {
-/*N*/ bConvert = TRUE;
-/*N*/ nConvPara = nPara;
-/*N*/ nConvPos = nPos;
-/*N*/ }
-/*N*/ return EMPTY_STRING;
-/*N*/ }
-
/*N*/ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
/*N*/ {
/*N*/ delete pLeftArea;
diff --git a/binfilter/bf_sc/source/filter/xml/makefile.mk b/binfilter/bf_sc/source/filter/xml/makefile.mk
index 97f4877..d1d0db0 100644
--- a/binfilter/bf_sc/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sc/source/filter/xml/makefile.mk
@@ -47,7 +47,6 @@ INC+= -I$(PRJ)$/inc$/bf_sc
# --- Files --------------------------------------------------------
CXXFILES = \
- sc_xmlwrap.cxx \
sc_xmlimprt.cxx \
sc_xmlexprt.cxx \
sc_xmlbodyi.cxx \
@@ -96,7 +95,6 @@ CXXFILES = \
sc_XMLEmptyContext.cxx
SLOFILES = \
- $(SLO)$/sc_xmlwrap.obj \
$(SLO)$/sc_xmlimprt.obj \
$(SLO)$/sc_xmlexprt.obj \
$(SLO)$/sc_xmlbodyi.obj \
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
deleted file mode 100644
index 97098f9..0000000
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-// INCLUDE ---------------------------------------------------------------
-
-#include <bf_sfx2/docfile.hxx>
-#include <bf_sfx2/objsh.hxx>
-#include <unotools/streamwrap.hxx>
-#include <bf_svx/xmlgrhlp.hxx>
-#include <bf_svtools/sfxecode.hxx>
-#include <bf_sfx2/appuno.hxx>
-#include <bf_svtools/itemset.hxx>
-#include <bf_sfx2/sfxsids.hrc>
-
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <comphelper/extract.hxx>
-#include <comphelper/genericpropertyset.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/packages/zip/ZipIOException.hpp>
-
-#include <bf_svx/xmleohlp.hxx>
-#include <rtl/logfile.hxx>
-#include <bf_svtools/saveopt.hxx>
-
-#include "document.hxx"
-#include "xmlwrap.hxx"
-#include "xmlimprt.hxx"
-#include "xmlexprt.hxx"
-#include "globstr.hrc"
-#include "scerrors.hxx"
-#include "XMLExportSharedData.hxx"
-#include <legacysmgr/legacy_binfilters_smgr.hxx>
-#ifndef SEQTYPE
-namespace binfilter {
- #if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
- #define SEQTYPE(x) (new ::com::sun::star::uno::Type( x ))
- #else
- #define SEQTYPE(x) &(x)
- #endif
-#endif
-
-#define MAP_LEN(x) x, sizeof(x) - 1
-
-using namespace ::com::sun::star;
-
-using rtl::OUString;
-
-// -----------------------------------------------------------------------
-
-ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, SvStorage* pS) :
- rDoc(rD),
- pMedium(pM),
- pStorage(pS)
-{
- DBG_ASSERT( pMedium || pStorage, "ScXMLImportWrapper: Medium or Storage must be set" );
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index c22b1d0..94ffa08 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -71,7 +71,6 @@
#include "printfun.hxx"
#include "chartlis.hxx"
#include "hints.hxx"
-#include "xmlwrap.hxx"
#include "drwlayer.hxx"
#include "dbcolect.hxx"
diff --git a/binfilter/bf_sc/source/ui/inc/viewdata.hxx b/binfilter/bf_sc/source/ui/inc/viewdata.hxx
index 9f622db..a3c3b05 100644
--- a/binfilter/bf_sc/source/ui/inc/viewdata.hxx
+++ b/binfilter/bf_sc/source/ui/inc/viewdata.hxx
@@ -193,7 +193,6 @@ public:
void ReadUserData(const String& rData); // #116578#
void WriteUserDataSequence(::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue>& rSettings);
- void ReadUserDataSequence(const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue>& rSettings); // #116578#
ScDocument* GetDocument() const;
diff --git a/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx b/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx
index e5e706d..73a7a12 100644
--- a/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx
+++ b/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx
@@ -618,125 +618,6 @@ void ScViewData::ReadUserData(const String& rData)
/*N*/ }
/*N*/ }
-// #116578# ReadUserDataSequence is needed, must not access pView
-void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>& rSettings)
-{
- sal_Int32 nCount(rSettings.getLength());
- sal_Int32 nTemp32(0);
- sal_Bool bPageMode(sal_False);
- for (sal_Int32 i = 0; i < nCount; i++)
- {
- // SC_VIEWID has to parse and use by mba
- ::rtl::OUString sName(rSettings[i].Name);
- if (sName.compareToAscii(SC_TABLES) == 0)
- {
- uno::Reference<container::XNameContainer> xNameContainer;
- if ((rSettings[i].Value >>= xNameContainer) && xNameContainer->hasElements())
- {
- uno::Sequence< ::rtl::OUString > aNames(xNameContainer->getElementNames());
- for (sal_Int32 j = 0; j < aNames.getLength(); j++)
- {
- String sTabName(aNames[j]);
- sal_uInt16 nTab(0);
- if (GetDocument()->GetTable(sTabName, nTab))
- {
- uno::Any aAny = xNameContainer->getByName(aNames[j]);
- uno::Sequence<beans::PropertyValue> aTabSettings;
- if (aAny >>= aTabSettings)
- {
- pTabData[nTab] = new ScViewDataTable;
- pTabData[nTab]->ReadUserDataSequence(aTabSettings);
- }
- }
- }
- }
- }
- else if (sName.compareToAscii(SC_ACTIVETABLE) == 0)
- {
- ::rtl::OUString sLclName;
- if(rSettings[i].Value >>= sLclName)
- {
- String sTabName(sLclName);
- sal_uInt16 nTab(0);
- if (GetDocument()->GetTable(sTabName, nTab))
- nTabNo = nTab;
- }
- }
- else if (sName.compareToAscii(SC_HORIZONTALSCROLLBARWIDTH) == 0)
- {
- if (rSettings[i].Value >>= nTemp32)
- nTabBarWidth = nTemp32; // #116578# store locally
- }
- else if (sName.compareToAscii(SC_ZOOMTYPE) == 0)
- {
- // #116578# zoom type is ignored for conversion to binary
- }
- else if (sName.compareToAscii(SC_ZOOMVALUE) == 0)
- {
- if (rSettings[i].Value >>= nTemp32)
- {
- Fraction aZoom(nTemp32, 100);
- aZoomX = aZoomY = aZoom;
- }
- }
- else if (sName.compareToAscii(SC_PAGEVIEWZOOMVALUE) == 0)
- {
- if (rSettings[i].Value >>= nTemp32)
- {
- Fraction aZoom(nTemp32, 100);
- aPageZoomX = aPageZoomY = aZoom;
- }
- }
- else if (sName.compareToAscii(SC_SHOWPAGEBREAKPREVIEW) == 0)
- bPageMode = ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value );
- else if ( sName.compareToAscii( SC_UNO_SHOWZERO ) == 0 )
- pOptions->SetOption(VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHOWNOTES ) == 0 )
- pOptions->SetOption(VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHOWGRID ) == 0 )
- pOptions->SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_GRIDCOLOR ) == 0 )
- {
- sal_Int64 nColor = 0;
- if (rSettings[i].Value >>= nColor)
- {
- String aColorName;
- Color aColor(static_cast<sal_uInt32>(nColor));
- pOptions->SetGridColor(aColor, aColorName);
- }
- }
- else if ( sName.compareToAscii( SC_UNO_SHOWPAGEBR ) == 0 )
- pOptions->SetOption(VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_COLROWHDR ) == 0 )
- pOptions->SetOption(VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHEETTABS ) == 0 )
- pOptions->SetOption(VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_OUTLSYMB ) == 0 )
- pOptions->SetOption(VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else
- {
- ScGridOptions aGridOpt(pOptions->GetGridOptions());
- if ( sName.compareToAscii( SC_UNO_SNAPTORASTER ) == 0 )
- aGridOpt.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERVIS ) == 0 )
- aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERRESX ) == 0 )
- aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERRESY ) == 0 )
- aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERSUBX ) == 0 )
- aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERSUBY ) == 0 )
- aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERSYNC ) == 0 )
- aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- pOptions->SetGridOptions(aGridOpt);
- }
- }
- if (nCount)
- SetPagebreakMode( bPageMode );
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
index 3ba8069..6bb924d 100644
--- a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
+++ b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
@@ -35,8 +35,6 @@
#include <bf_sfx2/docfile.hxx>
#include <bf_svtools/sfxecode.hxx>
-#include "SchXMLWrapper.hxx"
-
#include <unotools/streamwrap.hxx>
#include <bf_svx/xmlgrhlp.hxx>
#include <tools/debug.hxx>
@@ -71,17 +69,6 @@ XML_STRING( sXML_import_chart_styles_service, "com.sun.star.comp.Chart.XML
XML_STRING( sXML_import_chart_content_service, "com.sun.star.comp.Chart.XMLContentImporter" );
XML_STRING( sXML_import_chart_old_content_service, "com.sun.star.office.sax.importer.Chart" );
-using namespace ::com::sun::star;
-using namespace ::rtl;
-using namespace comphelper;
-
-/*N*/ SchXMLWrapper::SchXMLWrapper( uno::Reference< frame::XModel >& xModel,
-/*N*/ SvStorage& rStorage,
-/*N*/ sal_Bool bShowProgress ) :
-/*N*/ mxModel( xModel ),
-/*N*/ mrStorage( rStorage ),
-/*N*/ mbShowProgress( bShowProgress )
-/*N*/ {}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index 2b6c78d..a7d3edd 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -59,7 +59,6 @@
#include "ChXChartDocument.hxx"
#include "ChXChartData.hxx"
-#include "SchXMLWrapper.hxx"
#include "memchrt.hxx"
namespace binfilter {
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index 005cfae..f0c60dd 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -265,57 +265,6 @@ sal_Int32 ReadThroughComponent(
return 0;
}
-sal_Int32 ReadThroughComponent(
- SvStorage* pStorage,
- Reference<XComponent> xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
- Reference<lang::XMultiServiceFactory> & rFactory,
- const sal_Char* pFilterName,
- Sequence<Any> rFilterArguments,
- const OUString& rName,
- sal_Bool bMustBeSuccessfull )
-{
- DBG_ASSERT(NULL != pStorage, "Need storage!");
- DBG_ASSERT(NULL != pStreamName, "Please, please, give me a name!");
-
- // open stream (and set parser input)
- OUString sStreamName = OUString::createFromAscii(pStreamName);
- if (! pStorage->IsStream(sStreamName))
- {
- // stream name not found! Then try the compatibility name.
- // if no stream can be opened, return immediatly with OK signal
-
- // do we even have an alternative name?
- if ( NULL == pCompatibilityStreamName )
- return 0;
-
- // if so, does the stream exist?
- sStreamName = OUString::createFromAscii(pCompatibilityStreamName);
- if (! pStorage->IsStream(sStreamName) )
- return 0;
- }
-
- // get input stream
- SvStorageStreamRef xEventsStream;
- xEventsStream = pStorage->OpenStream( sStreamName,
- STREAM_READ | STREAM_NOCREATE );
- Any aAny;
- sal_Bool bEncrypted =
- xEventsStream->GetProperty(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ), aAny ) &&
- aAny.getValueType() == ::getBooleanCppuType() &&
- *(sal_Bool *)aAny.getValue();
-
- Reference<io::XInputStream> xInputStream = xEventsStream->GetXInputStream();
-
- // read from the stream
- return ReadThroughComponent(
- xInputStream, xModelComponent, sStreamName, rFactory,
- pFilterName, rFilterArguments,
- rName, bMustBeSuccessfull, bEncrypted );
-}
-
// -----------------------------------------------------------------------------
sal_Bool SdXMLFilter::Import()
diff --git a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
index 2ee22bc..58f16c8 100644
--- a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
+++ b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
@@ -270,28 +270,6 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
*pStream << SFX_REC_HEADER(nRecordType, nContentTag, nContentVer);
}
-//-------------------------------------------------------------------------
-
-SfxSingleRecordWriter::SfxSingleRecordWriter
-(
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- UINT16 nContentTag, // Inhalts-Art-Kennung
- BYTE nContentVer // Inhalts-Versions-Kennung
-)
-
-/* [Beschreibung]
-
- Legt in 'pStream' einen 'SfxSingleRecord' an, dessen Content-Gr"o\se
- nicht bekannt ist, sondern nach dam Streamen des Contents errechnet
- werden soll.
-*/
-
-: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT )
-{
- // Erweiterten Header hiner den des SfxMiniRec schreiben
- *pStream << SFX_REC_HEADER( SFX_REC_TYPE_SINGLE, nContentTag, nContentVer);
-}
-
//=========================================================================
inline bool SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes )
@@ -459,106 +437,6 @@ UINT32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec )
//=========================================================================
-SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
-(
- BYTE nRecordType, // Record-Kennung der Subklasse
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- UINT16 nRecordTag, // Gesamt-Art-Kennung
- BYTE nRecordVer // Gesamt-Versions-Kennung
-)
-
-/* [Beschreibung]
-
- Interner Ctor f"ur Subklassen.
-*/
-
-: SfxMultiFixRecordWriter( nRecordType, pStream, nRecordTag, nRecordVer, 0 ),
- _nContentVer( 0 )
-{
-}
-
-//-------------------------------------------------------------------------
-
-SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter()
-
-/* [Beschreibung]
-
- Der Dtor der Klasse <SfxMultiVarRecordWriter> schlie\st den Record
- automatisch, falls <SfxMultiVarRecordWriter::Close()> nicht bereits
- explizit gerufen wurde.
-*/
-
-{
- // wurde der Header noch nicht geschrieben oder mu\s er gepr"uft werden
- if ( !_bHeaderOk )
- Close();
-}
-
-//-------------------------------------------------------------------------
-
-void SfxMultiVarRecordWriter::FlushContent_Impl()
-
-/* [Beschreibung]
-
- Interne Methode zum Abschlie\sen eines einzelnen Contents.
-*/
-
-{
- // Versions-Kennung und Positions-Offset des aktuellen Contents merken;
- // das Positions-Offset ist relativ zur Startposition des ersten Contents
- _aContentOfs.Insert(
- SFX_REC_CONTENT_HEADER(_nContentVer,_nStartPos,_nContentStartPos),
- _nContentCount-1 );
-}
-
-//-------------------------------------------------------------------------
-
-UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec )
-
-// siehe <SfxMiniRecordWriter>
-
-{
- // Header noch nicht geschrieben?
- if ( !_bHeaderOk )
- {
- // ggf. letzten Content abschlie\sen
- if ( _nContentCount )
- FlushContent_Impl();
-
- // Content-Offset-Tabelle schreiben
- UINT32 nContentOfsPos = _pStream->Tell();
- //! darf man das so einr"ucken?
- #if defined(OSL_LITENDIAN)
- _pStream->Write( _aContentOfs.GetData(),
- sizeof(UINT32)*_nContentCount );
- #else
- for ( USHORT n = 0; n < _nContentCount; ++n )
- *_pStream << UINT32(_aContentOfs[n]);
- #endif
-
- // SfxMultiFixRecordWriter::Close() "uberspringen!
- UINT32 nEndPos = SfxSingleRecordWriter::Close( FALSE );
-
- // eigenen Header schreiben
- *_pStream << _nContentCount;
- if ( SFX_REC_TYPE_VARSIZE_RELOC == _nPreTag ||
- SFX_REC_TYPE_MIXTAGS_RELOC == _nPreTag )
- *_pStream << static_cast<UINT32>(nContentOfsPos - ( _pStream->Tell() + sizeof(UINT32) ));
- else
- *_pStream << nContentOfsPos;
-
- // ans Ende des Records seeken bzw. am Ende des Headers bleiben
- if ( bSeekToEndOfRec )
- _pStream->Seek(nEndPos);
- return nEndPos;
- }
-
- // Record war bereits vorher geschlossen
- return 0;
-}
-
-//=========================================================================
-
bool SfxMultiRecordReader::ReadHeader_Impl()
/* [Beschreibung]
diff --git a/binfilter/bf_svtools/source/misc1/svt_strmadpt.cxx b/binfilter/bf_svtools/source/misc1/svt_strmadpt.cxx
index ba81131..002131d 100644
--- a/binfilter/bf_svtools/source/misc1/svt_strmadpt.cxx
+++ b/binfilter/bf_svtools/source/misc1/svt_strmadpt.cxx
@@ -100,10 +100,6 @@ public:
inline bool isEOF() const;
- bool addMark(sal_uInt32 nPosition);
-
- bool removeMark(sal_uInt32 nPosition);
-
inline sal_uInt32 getReadPosition() const;
SeekResult setReadPosition(sal_uInt32 nPosition);
@@ -847,26 +843,6 @@ sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize)
}
//============================================================================
-bool SvDataPipe_Impl::addMark(sal_uInt32 nPosition)
-{
- if (m_pFirstPage != 0 && m_pFirstPage->m_nOffset > nPosition)
- return false;
- m_aMarks.insert(nPosition);
- return true;
-}
-
-//============================================================================
-bool SvDataPipe_Impl::removeMark(sal_uInt32 nPosition)
-{
- std::multiset< sal_uInt32 >::iterator t = m_aMarks.find(nPosition);
- if (t == m_aMarks.end())
- return false;
- m_aMarks.erase(t);
- while (remove(m_pFirstPage));
- return true;
-}
-
-//============================================================================
SvDataPipe_Impl::SeekResult SvDataPipe_Impl::setReadPosition(sal_uInt32
nPosition)
{
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 7477200..0de5dde 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -531,15 +531,6 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return aStr;
/*N*/ }
-/*N*/ sal_Bool EditEngine::IsModified() const
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/ return pImpEditEngine->IsModified();
-/*N*/ }
-
-
-
-
/*N*/ void EditEngine::InsertParagraph( sal_uInt16 nPara, const XubString& rTxt )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
index 67c7cbf..23e2deb 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
@@ -113,10 +113,6 @@ namespace binfilter {
/*N*/ return CONTAINER_ENTRY_NOTFOUND;
/*N*/ }
-/*N*/ void SdrMarkList::InsertEntry(const SdrMark& /*rMark*/, bool /*bChkSort*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
/*N*/ {
/*N*/ bool bChgd=FALSE;
diff --git a/binfilter/inc/bf_sc/xmlwrap.hxx b/binfilter/inc/bf_sc/xmlwrap.hxx
deleted file mode 100644
index b18c9fc..0000000
--- a/binfilter/inc/bf_sc/xmlwrap.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-namespace com { namespace sun { namespace star {
- namespace uno { template<class X> class Reference; }
- namespace frame { class XModel; }
- namespace task { class XStatusIndicator; }
- namespace lang { class XMultiServiceFactory; }
- namespace uno { class XInterface; }
- namespace xml {
- namespace sax { struct InputSource; } }
-} } }
-
-#ifndef SC_XMLWRAP_HXX
-#define SC_XMLWRAP_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-namespace binfilter {
-
-
-class SvStorage;
-class ScDocument;
-class SfxMedium;
-class ScMySharedData;
-
-
-class ScXMLImportWrapper
-{
- ScDocument& rDoc;
- SfxMedium* pMedium;
- SvStorage* pStorage;
-
-public:
- ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, SvStorage* pS);
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sch/SchXMLWrapper.hxx b/binfilter/inc/bf_sch/SchXMLWrapper.hxx
deleted file mode 100644
index df8eaa3..0000000
--- a/binfilter/inc/bf_sch/SchXMLWrapper.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SCH_XMLWRP_HXX_
-#define _SCH_XMLWRP_HXX_
-
-#include <bf_so3/svstor.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml {
- namespace sax {
- class XParser;
- }
- }
- namespace document {
- class XGraphicObjectResolver;
- }
- namespace frame {
- class XModel;
- }
- namespace task {
- class XStatusIndicator;
- }
- namespace lang {
- class XMultiServiceFactory;
- }
- namespace io {
- class XActiveDataSource;
- }
-}}}
-namespace binfilter {
-
-
-class SchXMLWrapper
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator;
- SvStorage& mrStorage;
-
- sal_Bool mbIsDraw : 1;
- sal_Bool mbShowProgress : 1;
-
-public:
- SchXMLWrapper( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
- SvStorage& rStorage,
- sal_Bool bShowProgress = TRUE );
-
- sal_Int32 Import();
-};
-
-} //namespace binfilter
-#endif // _SCH_XMLWRP_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svtools/filerec.hxx b/binfilter/inc/bf_svtools/filerec.hxx
index b10e6d4..70db0d6 100644
--- a/binfilter/inc/bf_svtools/filerec.hxx
+++ b/binfilter/inc/bf_svtools/filerec.hxx
@@ -363,9 +363,6 @@ protected:
UINT16 nTag, BYTE nCurVer );
public:
- SfxSingleRecordWriter( SvStream *pStream,
- UINT16 nTag, BYTE nCurVer );
-
inline void Reset();
UINT32 Close( bool bSeekToEndOfRec = TRUE );
@@ -500,78 +497,13 @@ public:
//------------------------------------------------------------------------
-class SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter
-{
-protected:
- SfxUINT32s _aContentOfs;
- USHORT _nContentVer; // nur f"ur SfxMultiMixRecordWriter
-
- SfxMultiVarRecordWriter( BYTE nRecordType,
- SvStream *pStream,
- USHORT nRecordTag,
- BYTE nRecordVer );
-
- void FlushContent_Impl();
-
-public:
- virtual ~SfxMultiVarRecordWriter();
-
- virtual UINT32 Close( bool bSeekToEndOfRec = TRUE );
-};
-
-//------------------------------------------------------------------------
-
-class SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter
-
-/* [Beschreibung]
-
- Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben
- werden, der seine eigene L"ange speichert und somit auch von "alteren
- Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen,
- "ubersprungen werden kann.
-
- Er enth"alt mehrere Inhalte von demselben Typ (Tag) und derselben
- Version, die einmalig (stellvertretend f"ur alle) im Header des Records
- identifiziert werden. Alle Inhalte haben eine vorher bekannte und
- identische L"ange.
-
- Um Auf- und Abw"artskompatiblit"at gew"ahrleisten zu k"onnen, m"ussen
- neue Versionen die Daten der "alteren immer komplett enthalten,
- es d"urfen allenfalls neue Daten hinten angeh"angt werden!
-
- [Fileformat]
-
- 1* BYTE Pre-Tag (==0)
- 1* 3-BYTE OffsetToEndOfRec in Bytes
- 1* BYTE Record-Type (==SFX_REC_TYPE_MIXTAGS)
- 1* BYTE Content-Version
- 1* USHORT Record-Tag
- 1* UINT16 NumberOfContents
- 1* UINT32 OffsetToOfsTable
- NumberOfContents* (
- 1* USHORT Content-Tag
- ContentSize* BYTE Content
- )
- NumberOfContents* UINT32 ( ContentOfs << 8 + Version )
-*/
-
-{
-public:
- inline SfxMultiMixRecordWriter( SvStream *pStream,
- USHORT nRecordTag,
- BYTE nRecordVer );
-};
-
-//------------------------------------------------------------------------
-
class SfxMultiRecordReader: public SfxSingleRecordReader
/* [Beschreibung]
Mit Instanzen dieser Klasse kann ein aus mehreren Contents bestehender
Record aus einem Stream gelesen werden, der mit einer der Klassen
- <SfxMultiFixRecordWriter>, <SfxMultiVarRecordWriter> oder
- <SfxMultiMixRecordWriter> geschrieben wurde.
+ <SfxMultiFixRecordWriter> geschrieben wurde.
Es ist auch m"oglich, den Record oder einzelne Contents zu "uberspringen,
ohne das jeweilis interne Format zu kennen.
@@ -928,27 +860,6 @@ inline void SfxMultiFixRecordWriter::NewContent()
//=========================================================================
-inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter
-(
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- USHORT nRecordTag, // Gesamt-Record-Art-Kennung
- BYTE nRecordVer // Gesamt-Record-Versions-Kennung
-)
-
-/* [Beschreibung]
-
- Legt in 'pStream' einen 'SfxMultiMixRecord' an, f"ur dessen Contents
- je eine separate Kennung f"ur Art (Tag) und Version gespeichert wird.
- Die Gr"o\sen der einzelnen Contents werden automatisch ermittelt.
-*/
-
-: SfxMultiVarRecordWriter( SFX_REC_TYPE_MIXTAGS,
- pStream, nRecordTag, nRecordVer )
-{
-}
-
-//=========================================================================
-
inline void SfxMultiFixRecordWriter::Reset()
{
_pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI +
diff --git a/binfilter/inc/bf_svx/editeng.hxx b/binfilter/inc/bf_svx/editeng.hxx
index 7d43f73..4f7b9c0 100644
--- a/binfilter/inc/bf_svx/editeng.hxx
+++ b/binfilter/inc/bf_svx/editeng.hxx
@@ -218,7 +218,6 @@ public:
BOOL IsUndoEnabled();
void SetModified();
- BOOL IsModified() const;
Link GetModifyHdl() const;
diff --git a/binfilter/inc/bf_svx/svdmark.hxx b/binfilter/inc/bf_svx/svdmark.hxx
index 4aacc5a..eaab3a4 100644
--- a/binfilter/inc/bf_svx/svdmark.hxx
+++ b/binfilter/inc/bf_svx/svdmark.hxx
@@ -130,8 +130,6 @@ public:
// CONTAINER_ENTRY_NOTFOUND.
ULONG FindObject(const SdrObject* pObj);
- void InsertEntry(const SdrMark& rMark, bool bChkSort=TRUE);
-
// bReverse kann einen Performancevorteil bringen, wenn sicher ist,
// dass die SrcList genau verkehrt herum ist.
@@ -155,9 +153,6 @@ public:
void operator=(const SdrMarkList& rLst);
};
-// Die Klasse kopiert alle eingefuegten MarkEntrys auf den Heap. Die Verwendung
-// ist z.B. wie folgt gedacht:
-// InsertEntry(SdrMark(pObj,pPage));
}//end of namespace binfilter
#endif //_SVDMARK_HXX
commit 3eb3f167f7a43d58e9afe5dd9b38c1a985b32c76
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 19:29:15 2011 +0100
another layer
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index 98874c0..f48fe67 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -60,7 +60,6 @@
#include <shellres.hxx>
namespace binfilter {
-BOOL ViewShell::bLstAct = FALSE;
ShellResource *ViewShell::pShellRes = 0;
Window *ViewShell::pCareWindow = 0;
@@ -90,11 +89,10 @@ bool bInSizeNotify = FALSE;
/*N*/ bInEndAction = TRUE;
/*N*/
/*N*/ //Laeuft hiermit das EndAction der Letzten Shell im Ring?
-/*N*/ ViewShell::bLstAct = TRUE;
/*N*/ ViewShell *pSh = (ViewShell*)this->GetNext();
/*N*/ while ( pSh != this )
/*?*/ { if ( pSh->ActionPend() )
-/*?*/ { ViewShell::bLstAct = FALSE;
+/*?*/ {
/*?*/ pSh = this;
/*?*/ }
/*?*/ else
@@ -188,7 +186,6 @@ bool bInSizeNotify = FALSE;
/*N*/ bPaintWorks = TRUE;
/*N*/
/*N*/ bInEndAction = FALSE;
-/*N*/ ViewShell::bLstAct = FALSE;
/*N*/ Imp()->EndAction();
/*N*/
/*N*/
@@ -331,40 +328,6 @@ bool bInSizeNotify = FALSE;
/*N*/ } while ( pSh != this );
/*N*/ }
-/******************************************************************************
-|*
-|* ViewShell::SizeChgNotify()
-|*
-******************************************************************************/
-
-/*N*/ void ViewShell::SizeChgNotify(const Size &)
-/*N*/ {
-/*N*/ if ( !pWin )
-/*N*/ bDocSizeChgd = TRUE;
-/*N*/ else if( ActionPend() || Imp()->IsCalcLayoutProgress() || bPaintInProgress )
-/*N*/ {
-/*N*/ bDocSizeChgd = TRUE;
-/*N*/
-/*N*/ if ( !Imp()->IsCalcLayoutProgress() && ISA( SwCrsrShell ) )
-/*N*/ {
-/*N*/ const SwFrm *pCnt = ((SwCrsrShell*)this)->GetCurrFrm();
-/*N*/ const SwPageFrm *pPage;
-/*N*/ if ( pCnt && 0 != (pPage = pCnt->FindPageFrm()) )
-/*N*/ {
-/*N*/ USHORT nVirtNum = pPage->GetVirtPageNum();
-/*N*/ const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
-/*N*/ String sDisplay = rNum.GetNumStr( nVirtNum );
-/*N*/ DBG_BF_ASSERT(0, "STRIP");//PageNumNotify( this, pCnt->GetPhyPageNum(), nVirtNum, sDisplay );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ bDocSizeChgd = FALSE;
-/*N*/ DBG_BF_ASSERT(0, "STRIP");//::binfilter::SizeNotify( this, GetLayout()->Frm().SSize() );
-/*N*/ }
-/*N*/ }
-
/*N*/ OutputDevice& ViewShell::GetRefDev() const
/*N*/ {
/*N*/ OutputDevice* pTmpOut = 0;
diff --git a/binfilter/inc/bf_svx/xoutx.hxx b/binfilter/inc/bf_svx/xoutx.hxx
index fc1b0ea..56bd9a7 100644
--- a/binfilter/inc/bf_svx/xoutx.hxx
+++ b/binfilter/inc/bf_svx/xoutx.hxx
@@ -197,7 +197,6 @@ protected:
~XOutputDevice();
OutputDevice* GetOutDev() const { return pOut; }
- void SetOutDev(OutputDevice* pNewOut) { pOut=pNewOut; }
RasterOp GetRasterOp() const { return pOut->GetRasterOp(); }
void SetRasterOp(RasterOp eRop) { pOut->SetRasterOp(eRop); }
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index fcfb213..de4c424 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -80,24 +80,11 @@ struct SwAccessibilityOptions;
class ViewShell : public Ring
{
- friend void SetOutDev( ViewShell *pSh, OutputDevice *pOut );
- friend void SetOutDevAndWin( ViewShell *pSh, OutputDevice *pOut,
- Window *pWin, sal_uInt16 nZoom );
-
friend class SwViewImp;
// OD 12.12.2002 #103492# - for setting visible area for page preview paint
friend class SwPagePreviewLayout;
- //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert
- //werden kann.
- friend void SetSwVisArea( ViewShell *pSh, const SwRect &, BOOL bPDFExport = FALSE );
-
- static sal_Bool bLstAct; // sal_True wenn Das EndAction der letzten Shell
- // laeuft; also die EndActions der
- // anderen Shells auf das Dokument
- // abgearbeitet sind.
-
Point aPrtOffst; //Ofst fuer den Printer,
//nicht bedruckbarer Rand.
Size aBrowseBorder; //Rand fuer Framedokumente
@@ -201,8 +188,6 @@ public:
//uebergebene Rect im sichtbaren Ausschnitt liegt.
void MakeVisible( const SwRect & );
- //Bei naechster Gelegenheit die neue Dokuemntgroesse an das UI weiterreichen.
- void SizeChgNotify(const Size &);
void UISizeNotify(); //Das weiterreichen der aktuellen groesse.
@@ -224,8 +209,6 @@ public:
inline Window* GetWin() const { return pWin; }
inline OutputDevice* GetOut() const { return pOut; }
- static inline sal_Bool IsLstEndAction() { return ViewShell::bLstAct; }
-
// Setzt Drucker fuer ALLE Sichten im Ring; einschl. Invalidierungen
void SetVirDev( VirtualDevice* );
@@ -267,19 +250,6 @@ public:
// OD 12.12.2002 #103492#
SwPagePreviewLayout* PagePreviewLayout();
- /** adjust view options for page preview
-
- OD 09.01.2003 #i6467#
- Because page preview should show the document as it is printed -
- page preview is print preview -, the view options are adjusted to the
- same as for printing.
-
- @param _rPrintOptions
- input parameter - constant reference to print options, to which the
- view option will be adjusted.
- */
- void AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions );
-
// print page/print preview
void PrintPreViewPage( SwPrtOptions& rOptions, sal_uInt16 nRowCol,
SfxProgress& rProgress,
commit c8076539030725657008e7af02482218d218e3bf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 15:46:17 2011 +0100
arg to GetCurrFrm is always false
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 4eda951..7825afc 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -88,25 +88,14 @@ using namespace ::com::sun::star::util;
/*N*/ }
-/*N*/ SwCntntFrm *SwCrsrShell::GetCurrFrm( const BOOL bCalcFrm ) const
+/*N*/ SwCntntFrm *SwCrsrShell::GetCurrFrm() const
/*N*/ {
/*N*/ SET_CURR_SHELL( (ViewShell*)this );
/*N*/ SwCntntFrm *pRet = 0;
/*N*/ SwCntntNode *pNd = pCurCrsr->GetCntntNode();
/*N*/ if ( pNd )
/*N*/ {
-/*N*/ if ( bCalcFrm )
-/*N*/ {
-/*N*/ const USHORT* pST = &nStartAction;
-/*N*/ ++(*((USHORT*)pST));
-/*N*/ const Size aOldSz( GetLayout()->Frm().SSize() );
-/*N*/ pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() );
-/*N*/ --(*((USHORT*)pST));
-/*N*/ if( aOldSz != GetLayout()->Frm().SSize() )
-/*N*/ ((SwCrsrShell*)this)->SizeChgNotify( GetLayout()->Frm().SSize() );
-/*N*/ }
-/*N*/ else
-/*N*/ pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint(), FALSE);
+/*N*/ pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint(), FALSE);
/*N*/ }
/*N*/ return pRet;
/*N*/ }
@@ -246,7 +235,7 @@ using namespace ::com::sun::star::util;
/*N*/ {
/*N*/ if ( GetViewOptions()->IsReadonly() )
/*N*/ {
-/*N*/ SwFrm *pFrm = GetCurrFrm( FALSE );
+/*N*/ SwFrm *pFrm = GetCurrFrm();
/*N*/ SwFlyFrm *pFly;
/*N*/ if( pFrm && pFrm->IsInFly() &&
/*N*/ (pFly = pFrm->FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index eae5531..98874c0 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -347,7 +347,7 @@ bool bInSizeNotify = FALSE;
/*N*/
/*N*/ if ( !Imp()->IsCalcLayoutProgress() && ISA( SwCrsrShell ) )
/*N*/ {
-/*N*/ const SwFrm *pCnt = ((SwCrsrShell*)this)->GetCurrFrm( FALSE );
+/*N*/ const SwFrm *pCnt = ((SwCrsrShell*)this)->GetCurrFrm();
/*N*/ const SwPageFrm *pPage;
/*N*/ if ( pCnt && 0 != (pPage = pCnt->FindPageFrm()) )
/*N*/ {
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index cc31bb6..dbff114 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -282,7 +282,7 @@ public:
void SetOverwriteCrsr( bool bFlag ) { bOverwriteCrsr = bFlag; }
// gebe den aktuellen Frame, in dem der Cursor steht, zurueck
- SwCntntFrm *GetCurrFrm( const BOOL bCalcFrm = TRUE ) const;
+ SwCntntFrm *GetCurrFrm() const;
//TRUE wenn der Crsr wenn der Crsr wegen Readonly gehidet ist,
//FALSE wenn der arbeitet (trotz Readonly).
More information about the Libreoffice-commits
mailing list