basctl/source/dlged/dlged.cxx | 15 ---------------
sc/util/makefile.mk | 2 --
scp2/source/ooo/file_library_ooo.scp | 4 ++--
sdext/prj/d.lst | 2 ++
sdext/source/minimizer/makefile.mk | 4 ++++
sdext/source/presenter/makefile.mk | 4 ++++
6 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit a0b26e586c25e5819ffb1eef78a5d7271d1273f5
Author: Yuri Dario <yda...@apache.org>
Date: Mon May 20 08:29:17 2013 +0000
i118923 - OS/2 port: cleanup of old and unusable code.
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 7c47ac3..0623039 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1299,9 +1299,6 @@ void DlgEditor::Print( Printer* pPrinter, const String&
rTitle ) // not worki
MapMode aMap( MAP_100TH_MM );
pPrinter->SetMapMode( aMap );
Font aFont;
-#ifdef OS2
- //aFont.SetName( System::GetStandardFont( STDFONT_SWISS ).GetName() );
-#endif
aFont.SetAlign( ALIGN_BOTTOM );
aFont.SetSize( Size( 0, 360 ));
pPrinter->SetFont( aFont );
@@ -1313,18 +1310,6 @@ void DlgEditor::Print( Printer* pPrinter, const String&
rTitle ) // not worki
lcl_PrintHeader( pPrinter, rTitle );
Bitmap aDlg;
-#ifdef OS2
- Bitmap* pDlg = new Bitmap;
- //pSbxForm->SnapShot( *pDlg );
- SvMemoryStream* pStrm = new SvMemoryStream;
- *pStrm << *pDlg;
- delete pDlg;
- pStrm->Seek(0);
- *pStrm >> aDlg;
- delete pStrm;
-#else
- //pSbxForm->SnapShot( aDlg );
-#endif
Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) );
double nPaperSzWidth = aPaperSz.Width();
double nPaperSzHeight = aPaperSz.Height();
commit 739aa74697c7e6bd2954d80dce5dda99c6da40e5
Author: Yuri Dario <yda...@apache.org>
Date: Mon May 20 08:26:26 2013 +0000
i118923 - OS/2 port: enable named exports also for os2.
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 06919ed..072fd4f 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -63,9 +63,7 @@ RESLIB1SRSFILES=\
# --- StarClac DLL
SHL1TARGET= sc$(DLLPOSTFIX)
-.IF "$(GUI)" != "OS2"
SHL1USE_EXPORTS=name
-.ENDIF
SHL1IMPLIB= sci
# dynamic libraries
commit f543dc75e285523c8da486d5462c1fa46ab66bb3
Author: Yuri Dario <yda...@apache.org>
Date: Mon May 20 08:24:41 2013 +0000
i118923 - OS/2 port: use short names for dynamic libraries.
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 4b22096..759ecab 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1356,7 +1356,7 @@ File gid_File_Lib_PresentationMinimizer
#ifdef UNX
Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX));
#elif defined OS2
- Name = "PresentationMinimizer.dll";
+ Name = "PreMin.dll";
#else
Name = "PresentationMinimizer.uno.dll";
#endif
@@ -1369,7 +1369,7 @@ File gid_File_Lib_PresenterScreen
#ifdef UNX
Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX));
#elif defined OS2
- Name = "PresenterScreen.dll";
+ Name = "PreScr.dll";
#else
Name = "PresenterScreen.uno.dll";
#endif
diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst
index bd865bf..7e8c587 100644
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@ -25,7 +25,9 @@ mkdir: %_DEST%\xml%_EXT%
..\%__SRC%\misc\PresenterScreen.component
%_DEST%\xml%_EXT%\PresenterScreen.component
..\%__SRC%\bin\PresentationMinimizer*.dll
%_DEST%\bin%_EXT%\PresentationMinimizer*.dll
+..\%__SRC%\bin\PreMin*.dll %_DEST%\bin%_EXT%\PreMin*.dll
..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT%
..\%__SRC%\bin\PresenterScreen*.dll %_DEST%\bin%_EXT%\PresenterScreen*.dll
+..\%__SRC%\bin\PreScr*.dll %_DEST%\bin%_EXT%\PreScr*.dll
..\%__SRC%\lib\PresenterScreen*.so %_DEST%\lib%_EXT%
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
diff --git a/sdext/source/minimizer/makefile.mk
b/sdext/source/minimizer/makefile.mk
index da8b494..8d6ff37 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -55,7 +55,11 @@ SLOFILES=\
# --- Library -----------------------------------
+.IF "$(GUI)"=="OS2"
+SHL1TARGET=PreMin
+.ELSE
SHL1TARGET= $(TARGET).uno
+.ENDIF
SHL1STDLIBS=\
$(CPPUHELPERLIB)\
diff --git a/sdext/source/presenter/makefile.mk
b/sdext/source/presenter/makefile.mk
index b1541c8..54c435a 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -95,7 +95,11 @@ SLOFILES=\
# --- Library -----------------------------------
+.IF "$(GUI)"=="OS2"
+SHL1TARGET=PreScr
+.ELSE
SHL1TARGET=$(TARGET).uno
+.ENDIF
SHL1STDLIBS= \
$(CPPUHELPERLIB) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
