summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2016-03-02 10:02:33 +0100
committerAndras Timar <andras.timar@collabora.com>2016-03-02 10:15:26 +0100
commit62728969ec83897cfc4f204f3a9daf8568ce3adc (patch)
tree2c87343eaa232a6ebaea1a8ef9849e8cc5d01dae
parentdd37b6176145ba6bea9afe67d28908d0d9f295a5 (diff)
lwp build fixescp-4.4-11
Change-Id: I56d537fa39616d93fb8b099cd142695dac4d8b93
-rw-r--r--lotuswordpro/qa/cppunit/test_lotuswordpro.cxx4
-rw-r--r--lotuswordpro/source/filter/LotusWordProImportFilter.cxx2
-rw-r--r--lotuswordpro/source/filter/bencont.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpbackgroundstuff.cxx2
-rw-r--r--lotuswordpro/source/filter/lwppagelayout.cxx8
5 files changed, 9 insertions, 9 deletions
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 7371136efc2c..72db87913af9 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -29,7 +29,7 @@ namespace
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
+ unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
void test();
@@ -51,7 +51,7 @@ namespace
bool LotusWordProTest::load(const OUString &,
const OUString &rURL, const OUString &,
- SfxFilterFlags, SotClipboardFormatId, unsigned int)
+ unsigned int, unsigned int, unsigned int)
{
uno::Sequence< beans::PropertyValue > aDescriptor(1);
aDescriptor[0].Name = "URL";
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 91c9b13b0f11..d3ee02a45adc 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -74,7 +74,7 @@ bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::sun::
pValue[i].Value >>= sURL;
}
- SvFileStream inputStream( sURL, StreamMode::READ );
+ SvFileStream inputStream( sURL, STREAM_READ );
if ( inputStream.IsEof() || ( inputStream.GetError() != SVSTREAM_OK ) )
return false;
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 3cb4a09fd233..2edbfe6c6602 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -352,7 +352,7 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
delete pS;
}
- pMemStream = new SvMemoryStream(pBuf, nLen, StreamMode::READ);
+ pMemStream = new SvMemoryStream(pBuf, nLen, STREAM_READ);
assert(pMemStream != NULL);
pStream = pMemStream;
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index 107850d5b472..ffaa7525bdda 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -118,7 +118,7 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern()
BitmapWriteAccess* pWA = aBmp.AcquireWriteAccess();
sal_uInt8* pBuf = pWA->GetBuffer();
memcpy(pBuf, aPttnArray, 32);
- Bitmap::ReleaseAccess(pWA);
+ aBmp.ReleaseAccess(pWA);
// create XOBitmap object from bitmap object
XOBitmap aXOBitmap( aBmp );
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 776b5740577b..a62d75057e41 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -642,12 +642,12 @@ void LwpPageLayout::GetWidthAndHeight(double& fWidth, double& fHeight)
if(GetUsePrinterSettings())
{
//replaced by printer paper size
- ScopedVclPtrInstance< Printer > pPrinter;
- bool bScreen = pPrinter->IsDisplayPrinter();
+ Printer aPrinter;
+ bool bScreen = aPrinter.IsDisplayPrinter();
if (!bScreen)//Printer available
{
- Size aPaperSize = pPrinter->GetPaperSize();
- aPaperSize = pPrinter->PixelToLogic( aPaperSize, MapMode( MAP_10TH_MM ) );
+ Size aPaperSize = aPrinter.GetPaperSize();
+ aPaperSize = aPrinter.PixelToLogic( aPaperSize, MapMode( MAP_10TH_MM ) );
fWidth = static_cast<double>(aPaperSize.Width())/100; //cm unit
fHeight = static_cast<double>(aPaperSize.Height())/100;
}