[Libreoffice-commits] .: 4 commits - binfilter/bf_sfx2 binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Apr 13 12:39:04 PDT 2011
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 1
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 13 ++
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx | 24 ----
binfilter/bf_sw/source/ui/inc/swcont.hxx | 2
binfilter/bf_sw/source/ui/makefile.mk | 2
binfilter/bf_sw/source/ui/shells/makefile.mk | 2
binfilter/bf_sw/source/ui/uno/makefile.mk | 2
binfilter/bf_sw/source/ui/uno/sw_RefreshListenerContainer.cxx | 4
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 16 +--
binfilter/bf_sw/source/ui/uno/sw_SwXPrintPreviewSettings.cxx | 12 +-
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 4
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 52 ++++------
binfilter/bf_sw/source/ui/wrtsh/makefile.mk | 2
binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx | 2
binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx | 19 ---
binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx | 2
binfilter/inc/bf_sw/iodetect.hxx | 5
binfilter/inc/bf_sw/swprtopt.hxx | 13 +-
18 files changed, 72 insertions(+), 105 deletions(-)
New commits:
commit 25e4bdcb77e5fa509f2ce54533da94720a122384
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 13:48:19 2011 +0100
add these back in to silence the MAXFILTER assert
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index 8aaedf4..ed36043 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -89,10 +89,23 @@ inline void _SetFltPtr( USHORT& rPos, SwRead pReader, const sal_Char* pNm )
void _InitFilter()
{
+ SwRead pRd;
+
USHORT nCnt = 0;
_SetFltPtr( nCnt, (ReadSw3 = new Sw3Reader), FILTER_SW5 );
_SetFltPtr( nCnt, ReadSw3, FILTER_SW4 );
_SetFltPtr( nCnt, ReadSw3, FILTER_SW3 );
+ _SetFltPtr( nCnt, (ReadSwg = new SwgReader), FILTER_SWG );
+ _SetFltPtr( nCnt, ReadSwg, FILTER_SWGV );
+ _SetFltPtr( nCnt, new Sw6Reader, sSwDos );
+ _SetFltPtr( nCnt, (ReadAscii = new AsciiReader), FILTER_BAS );
+ _SetFltPtr( nCnt, new W4WReader, FILTER_W4W );
+ _SetFltPtr( nCnt, ( pRd = new ExcelReader ), sCExcel );
+ _SetFltPtr( nCnt, pRd, sExcel );
+ _SetFltPtr( nCnt, new LotusReader, sLotusD );
+ _SetFltPtr( nCnt, ReadSwg, sSwg1 );
+
+ _SetFltPtr( nCnt, ReadAscii, FILTER_TEXT );
OSL_ENSURE( MAXFILTER == nCnt, "Anzahl Filter ungleich der Definierten" );
}
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index 606aaa9..50180b3 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -351,29 +351,7 @@ using namespace ::com::sun::star;
/*?*/ // we cannot create a SwDocShell. We could create a
/*?*/ // SwWebDocShell however, because this exists always
/*?*/ // for the help.
- OSL_ASSERT("ReadXML removed");
-
-// SvtModuleOptions aModuleOptions;
-// if( aModuleOptions.IsWriter() )
-// {
-// SwDocShell *pDocSh =
-// new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
-// SvEmbeddedObjectRef xDocSh = pDocSh;
-// if( pDocSh->DoInitNew( 0 ) )
-// {
-// pTemplate = pDocSh->GetDoc();
-// pTemplate->SetOle2Link( Link() );
-// pTemplate->SetBrowseMode( bTmplBrowseMode );
-// pTemplate->RemoveAllFmtLanguageDependencies();
-//
-// ReadXML->SetOrganizerMode( TRUE );
-// SwReader aRdr( *xStor, aEmptyStr, pTemplate );
-// aRdr.Read( *ReadXML );
-// ReadXML->SetOrganizerMode( FALSE );
-//
-// pTemplate->AddLink();
-// }
-// }
+ OSL_ASSERT("ReadXML removed");
/*?*/ }
/*?*/ else
/*?*/ {
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index 02e2416..ed4697a 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -105,7 +105,7 @@ struct SwIoDetect
#endif
-const USHORT MAXFILTER = 14;
+const USHORT MAXFILTER = 13;
#define FORAMTNAME_SW4 "StarWriter 4.0"
#define FORAMTNAME_SW3 "StarWriter 3.0"
@@ -161,8 +161,7 @@ SwIoDetect aReaderWriter[ MAXFILTER ] = { \
{/* 9*/ SwIoEntry(sExcel, 4, FALSE)}, \
{/*10*/ SwIoEntry(sLotusD, 5, TRUE)}, \
{/*11*/ SwIoEntry(sSwg1, 4, FALSE)}, \
- {/*12*/ SwIoEntry(FILTER_XML, 4, TRUE)}, \
- {/*13*/ SwIoEntry(FILTER_TEXT, 4, TRUE)} \
+ {/*12*/ SwIoEntry(FILTER_TEXT, 4, TRUE)} \
};
// Filter erkennung
commit 5c885c6d8702d72b6b8148590b46e1313e184e23
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 13:22:05 2011 +0100
this isn't helpful
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 58d31f6..ea1120f 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -371,7 +371,6 @@ sal_False Das Objekt konnte nicht geladen werden
xPer->DoOwnerLoad(xStor);
xPer->CleanUp();
- DBG_ASSERT( 0, "DoSave() and DoSaveCompleted() return value is not checked here, seems buggy" );
}
if ( xStor.Is() )
commit 6211d520fb09b80226a48a36a752ec85e1ba7015
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 12:36:34 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/inc/swcont.hxx b/binfilter/bf_sw/source/ui/inc/swcont.hxx
index 18ab748..8ceae75 100644
--- a/binfilter/bf_sw/source/ui/inc/swcont.hxx
+++ b/binfilter/bf_sw/source/ui/inc/swcont.hxx
@@ -94,7 +94,7 @@ public:
const SwContentType* GetParent() const {return pParent;}
const String& GetName() const {return sContentName;}
- int operator==(const SwContent& rCont) const
+ int operator==(const SwContent&) const
{
//gleich sind sie nie, sonst fallen sie aus dem Array
return FALSE;
diff --git a/binfilter/bf_sw/source/ui/makefile.mk b/binfilter/bf_sw/source/ui/makefile.mk
index 6201ae4..e637c91 100644
--- a/binfilter/bf_sw/source/ui/makefile.mk
+++ b/binfilter/bf_sw/source/ui/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sw/source/ui/shells/makefile.mk b/binfilter/bf_sw/source/ui/shells/makefile.mk
index 63bb74c..e7c27ac 100644
--- a/binfilter/bf_sw/source/ui/shells/makefile.mk
+++ b/binfilter/bf_sw/source/ui/shells/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/uno/makefile.mk b/binfilter/bf_sw/source/ui/uno/makefile.mk
index 9534496..d65b1a7 100644
--- a/binfilter/bf_sw/source/ui/uno/makefile.mk
+++ b/binfilter/bf_sw/source/ui/uno/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/uno/sw_RefreshListenerContainer.cxx b/binfilter/bf_sw/source/ui/uno/sw_RefreshListenerContainer.cxx
index 8b88ccd..39c677d 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_RefreshListenerContainer.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_RefreshListenerContainer.cxx
@@ -41,8 +41,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-SwRefreshListenerContainer::SwRefreshListenerContainer( uno::XInterface* pxParent)
-: SwEventListenerContainer ( pxParent )
+SwRefreshListenerContainer::SwRefreshListenerContainer( uno::XInterface* pParent)
+ : SwEventListenerContainer ( pParent )
{
}
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
index 3507e2e..50021d6 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
@@ -391,9 +391,9 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
break;
case HANDLE_APPLY_USER_DATA:
{
- SfxDocumentInfo& rInfo = mpDocSh->GetDocInfo();
+ SfxDocumentInfo& rLclInfo = mpDocSh->GetDocInfo();
sal_Bool bUseUserData = *(sal_Bool*)rValue.getValue();
- rInfo.SetUseUserData(bUseUserData);
+ rLclInfo.SetUseUserData(bUseUserData);
}
break;
case HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS:
@@ -425,9 +425,9 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
break;
case HANDLE_SAVE_VERSION_ON_CLOSE:
{
- SfxDocumentInfo& rInfo = mpDocSh->GetDocInfo();
+ SfxDocumentInfo& rLclInfo = mpDocSh->GetDocInfo();
sal_Bool bSaveVersion = *(sal_Bool*)rValue.getValue();
- rInfo.SetSaveVersionOnClose ( bSaveVersion );
+ rLclInfo.SetSaveVersionOnClose ( bSaveVersion );
}
break;
case HANDLE_UPDATE_FROM_TEMPLATE:
@@ -566,8 +566,8 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
break;
case HANDLE_APPLY_USER_DATA:
{
- SfxDocumentInfo &rInfo = mpDocSh->GetDocInfo();
- sal_Bool bUseUserInfo = rInfo.IsUseUserData();
+ SfxDocumentInfo &rLclInfo = mpDocSh->GetDocInfo();
+ sal_Bool bUseUserInfo = rLclInfo.IsUseUserData();
rValue.setValue(&bUseUserInfo, ::getBooleanCppuType());
}
break;
@@ -602,8 +602,8 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
break;
case HANDLE_SAVE_VERSION_ON_CLOSE:
{
- SfxDocumentInfo& rInfo = mpDocSh->GetDocInfo();
- sal_Bool bSaveVersion = rInfo.IsSaveVersionOnClose();
+ SfxDocumentInfo& rLclInfo = mpDocSh->GetDocInfo();
+ sal_Bool bSaveVersion = rLclInfo.IsSaveVersionOnClose();
rValue.setValue(&bSaveVersion, ::getBooleanCppuType());
}
break;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXPrintPreviewSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXPrintPreviewSettings.cxx
index 1fc42c0..afada49 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXPrintPreviewSettings.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXPrintPreviewSettings.cxx
@@ -277,42 +277,42 @@ void SwXPrintPreviewSettings::_getSingleValue( const comphelper::PropertyInfo &
{
bBool = FALSE;
if ( mpConstPreViewData )
- rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100 ( mpConstPreViewData->GetLeftSpace() ) );
+ rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED ( mpConstPreViewData->GetLeftSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
- rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100 ( mpConstPreViewData->GetRightSpace() ) );
+ rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED ( mpConstPreViewData->GetRightSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_TOP_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
- rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100 ( mpConstPreViewData->GetTopSpace() ) );
+ rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED ( mpConstPreViewData->GetTopSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
- rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100 ( mpConstPreViewData->GetBottomSpace() ) );
+ rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED ( mpConstPreViewData->GetBottomSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING:
{
bBool = FALSE;
if ( mpConstPreViewData )
- rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100 ( mpConstPreViewData->GetHorzSpace() ) );
+ rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED ( mpConstPreViewData->GetHorzSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING:
{
bBool = FALSE;
if ( mpConstPreViewData )
- rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100 ( mpConstPreViewData->GetVertSpace() ) );
+ rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED ( mpConstPreViewData->GetVertSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_NUM_ROWS:
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
index b89eed4..1ac6d28 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
@@ -537,10 +537,10 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( Run
SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw)
: ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() )
, pView(pVw)
-, bWeb(bWebView)
-, bObjectValid(sal_True)
, mpViewOption ( NULL )
, mpConstViewOption ( NULL )
+, bObjectValid(sal_True)
+, bWeb(bWebView)
{
// This property only exists if we have a view (ie, not at the module )
if ( !pView )
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 021dbf3..b9c7c25 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -97,9 +97,7 @@
#include <swtypes.hxx>
#include <swmodule.hxx>
#include <docstat.hxx>
-#ifndef _MODOPT_HXX //
#include <modcfg.hxx>
- #endif
#include <ndtxt.hxx>
#include <utlui.hrc>
#include <swcont.hxx>
@@ -254,29 +252,29 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeExceptio
SwXTextDocument::SwXTextDocument(SwDocShell* pShell) :
SfxBaseModel(pShell),
- aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_DOCUMENT)),
aRefreshCont ( static_cast < XTextDocument* > ( this ) ),
+ aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_DOCUMENT)),
pDocShell(pShell),
bObjectValid(pShell != 0),
+ pDrawPage(0),
+ pxXDrawPage(0),
+ pxXFootnotes(0),
+ pxXFootnoteSettings(0),
+ pxXEndnotes(0),
+ pxXEndnoteSettings(0),
+ pxXReferenceMarks(0),
+ pxXTextFieldTypes(0),
+ pxXTextFieldMasters(0),
+ pxXTextSections(0),
+ pxXBookmarks(0),
pxXTextTables(0),
pxXTextFrames(0),
pxXGraphicObjects(0),
pxXEmbeddedObjects(0),
- pxXTextSections(0),
- pxXBookmarks(0),
- pxXTextFieldTypes(0),
- pxXTextFieldMasters(0),
- pxXFootnotes(0),
- pxXEndnotes(0),
- pxXFootnoteSettings(0),
- pxXEndnoteSettings(0),
- pxXDocumentIndexes(0),
pxXStyleFamilies(0),
pxXChapterNumbering(0),
+ pxXDocumentIndexes(0),
pxXLineNumberingProperties(0),
- pDrawPage(0),
- pxXDrawPage(0),
- pxXReferenceMarks(0),
pxLinkTargetSupplier(0),
pxXRedlines(0)
{
@@ -850,17 +848,17 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void)
pArray[0] = beans::PropertyValue(C2U("PageRows"), -1, aVal, PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int16)aData.GetCol();
pArray[1] = beans::PropertyValue(C2U("PageColumns"), -1, aVal, PropertyState_DIRECT_VALUE);
- aVal <<= (sal_Int32)TWIP_TO_MM100(aData.GetLeftSpace());
+ aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetLeftSpace());
pArray[2] = beans::PropertyValue(C2U("LeftMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
- aVal <<= (sal_Int32)TWIP_TO_MM100(aData.GetRightSpace());
+ aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetRightSpace());
pArray[3] = beans::PropertyValue(C2U("RightMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
- aVal <<= (sal_Int32)TWIP_TO_MM100(aData.GetTopSpace());
+ aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetTopSpace());
pArray[4] = beans::PropertyValue(C2U("TopMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
- aVal <<= (sal_Int32)TWIP_TO_MM100(aData.GetBottomSpace());
+ aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetBottomSpace());
pArray[5] = beans::PropertyValue(C2U("BottomMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
- aVal <<= (sal_Int32)TWIP_TO_MM100(aData.GetHorzSpace());
+ aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetHorzSpace());
pArray[6] = beans::PropertyValue(C2U("HoriMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
- aVal <<= (sal_Int32)TWIP_TO_MM100(aData.GetVertSpace());
+ aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetVertSpace());
pArray[7] = beans::PropertyValue(C2U("VertMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
BOOL bTemp = aData.GetLandscape();
aVal.setValue(&bTemp, ::getCppuBooleanType());
@@ -944,27 +942,27 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue
}
else if(COMPARE_EQUAL == sName.CompareToAscii("LeftMargin"))
{
- aData.SetLeftSpace(MM100_TO_TWIP(nVal));
+ aData.SetLeftSpace(MM100_TO_TWIP_UNSIGNED(nVal));
}
else if(COMPARE_EQUAL == sName.CompareToAscii("RightMargin"))
{
- aData.SetRightSpace(MM100_TO_TWIP(nVal));
+ aData.SetRightSpace(MM100_TO_TWIP_UNSIGNED(nVal));
}
else if(COMPARE_EQUAL == sName.CompareToAscii("TopMargin"))
{
- aData.SetTopSpace(MM100_TO_TWIP(nVal));
+ aData.SetTopSpace(MM100_TO_TWIP_UNSIGNED(nVal));
}
else if(COMPARE_EQUAL == sName.CompareToAscii("BottomMargin"))
{
- aData.SetBottomSpace(MM100_TO_TWIP(nVal));
+ aData.SetBottomSpace(MM100_TO_TWIP_UNSIGNED(nVal));
}
else if(COMPARE_EQUAL == sName.CompareToAscii("HoriMargin"))
{
- aData.SetHorzSpace(MM100_TO_TWIP(nVal));
+ aData.SetHorzSpace(MM100_TO_TWIP_UNSIGNED(nVal));
}
else if(COMPARE_EQUAL == sName.CompareToAscii("VertMargin"))
{
- aData.SetVertSpace(MM100_TO_TWIP(nVal));
+ aData.SetVertSpace(MM100_TO_TWIP_UNSIGNED(nVal));
}
else if(COMPARE_EQUAL == sName.CompareToAscii("IsLandscape"))
{
diff --git a/binfilter/inc/bf_sw/swprtopt.hxx b/binfilter/inc/bf_sw/swprtopt.hxx
index 1c53856..5e5900c 100644
--- a/binfilter/inc/bf_sw/swprtopt.hxx
+++ b/binfilter/inc/bf_sw/swprtopt.hxx
@@ -46,10 +46,15 @@ class SwPrtOptions : public SwPrintData
String sJobName;
public:
- SwPrtOptions( const String& rJobName ) : aOffset( Point(0,0) ),
- nMergeCnt( 0 ), nMergeAct( 0 ), sJobName( rJobName ),
- nJobNo( 1 ), bCollate(FALSE), bPrintSelection (FALSE),
- bJobStartet(FALSE)
+ SwPrtOptions( const String& rJobName )
+ : nJobNo( 1 )
+ , sJobName( rJobName )
+ , aOffset( Point(0,0) )
+ , nMergeCnt( 0 )
+ , nMergeAct( 0 )
+ , bCollate(FALSE)
+ , bPrintSelection (FALSE)
+ , bJobStartet(FALSE)
{}
const String& GetJobName() const { return sJobName; }
commit b54b51e805702ea6410330c2bc561814087493e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 11:42:06 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/wrtsh/makefile.mk b/binfilter/bf_sw/source/ui/wrtsh/makefile.mk
index 16e6745..3e76a45 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/makefile.mk
+++ b/binfilter/bf_sw/source/ui/wrtsh/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx
index 1c9743e..1073809 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx
+++ b/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx
@@ -58,7 +58,7 @@ const long nReadOnlyScrollOfst = 10;
------------------------------------------------------------------------*/
-/*N*/ BOOL SwWrtShell::PopCrsr(BOOL bUpdate, BOOL bSelect)
+/*N*/ BOOL SwWrtShell::PopCrsr(BOOL bUpdate, BOOL)
/*N*/ {
/*N*/ if( 0 == pCrsrStack)
/*N*/ return FALSE;
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx
index e4ba233..8e786cd 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx
+++ b/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx
@@ -33,9 +33,6 @@
#include <limits.h>
-
-
-
#include <cmdid.h>
#include <horiornt.hxx>
@@ -44,21 +41,7 @@
namespace binfilter {
-namespace com { namespace sun { namespace star { namespace util {
- struct SearchOptions;
-} } } }
-
-using namespace ::com::sun::star::util;
-
-
-static long nStartDragX = 0, nStartDragY = 0;
-static BOOL bStartDrag = FALSE;
-
-/*------------------------------------------------------------------------
- Beschreibung: Rahmengebundenes Macro ausfuehren
-------------------------------------------------------------------------*/
-
-/*N*/ IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFmt )
+/*N*/ IMPL_LINK( SwWrtShell, ExecFlyMac, void *, EMPTYARG )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP");
/*N*/ return 0;
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx
index 7b666b7..31df12e 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx
+++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx
@@ -55,7 +55,7 @@ extern sal_Bool bNoInterrupt; // in mainwn.cxx
--------------------------------------------------------------------*/
-/*N*/ void SwWrtShell::DrawSelChanged(SdrView* pView)
+/*N*/ void SwWrtShell::DrawSelChanged(SdrView*)
/*N*/ {
/*N*/ }
More information about the Libreoffice-commits
mailing list