[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2
vcl/os2/source/src/airbrush.ptr |binary vcl/os2/source/src/copydata.ptr |binary vcl/os2/source/src/crook.ptr|binary vcl/os2/source/src/linkdata.ptr |binary vcl/os2/source/src/mirror.ptr |binary vcl/os2/source/src/movedata.ptr |binary vcl/os2/source/src/pntbrsh.ptr |binary vcl/os2/source/src/rotate.ptr |binary vcl/os2/source/src/tblsele.ptr |binary vcl/os2/source/src/tblsels.ptr |binary vcl/os2/source/src/tblselse.ptr |binary vcl/os2/source/src/tblselsw.ptr |binary vcl/os2/source/src/tblselw.ptr |binary vcl/os2/source/src/vshear.ptr |binary vcl/os2/source/src/vtext.ptr|binary 15 files changed New commits: commit 4de46cae941314ec3ab2ac883f3e06332210f04d Author: Matthias Seidel AuthorDate: Sun Jan 13 15:48:47 2019 + Commit: Matthias Seidel CommitDate: Sun Jan 13 15:48:47 2019 + Unified OS/2 pointers (color depth) diff --git a/vcl/os2/source/src/airbrush.ptr b/vcl/os2/source/src/airbrush.ptr index a00f1472b814..f5cdbc42aebb 100644 Binary files a/vcl/os2/source/src/airbrush.ptr and b/vcl/os2/source/src/airbrush.ptr differ diff --git a/vcl/os2/source/src/copydata.ptr b/vcl/os2/source/src/copydata.ptr index e7e7ccd17e41..fa0620f99ba5 100644 Binary files a/vcl/os2/source/src/copydata.ptr and b/vcl/os2/source/src/copydata.ptr differ diff --git a/vcl/os2/source/src/crook.ptr b/vcl/os2/source/src/crook.ptr index 0b639614ddb3..2a5ac413aaad 100644 Binary files a/vcl/os2/source/src/crook.ptr and b/vcl/os2/source/src/crook.ptr differ diff --git a/vcl/os2/source/src/linkdata.ptr b/vcl/os2/source/src/linkdata.ptr index e5e6ace59be3..ae0d916f6d32 100644 Binary files a/vcl/os2/source/src/linkdata.ptr and b/vcl/os2/source/src/linkdata.ptr differ diff --git a/vcl/os2/source/src/mirror.ptr b/vcl/os2/source/src/mirror.ptr index 9135331048c9..4efc792595f0 100644 Binary files a/vcl/os2/source/src/mirror.ptr and b/vcl/os2/source/src/mirror.ptr differ diff --git a/vcl/os2/source/src/movedata.ptr b/vcl/os2/source/src/movedata.ptr index 689f38da772f..f9675a7a6b5d 100644 Binary files a/vcl/os2/source/src/movedata.ptr and b/vcl/os2/source/src/movedata.ptr differ diff --git a/vcl/os2/source/src/pntbrsh.ptr b/vcl/os2/source/src/pntbrsh.ptr index 506965e6b52d..eca7783313ac 100644 Binary files a/vcl/os2/source/src/pntbrsh.ptr and b/vcl/os2/source/src/pntbrsh.ptr differ diff --git a/vcl/os2/source/src/rotate.ptr b/vcl/os2/source/src/rotate.ptr index 622b05346cfc..df6ca213db48 100644 Binary files a/vcl/os2/source/src/rotate.ptr and b/vcl/os2/source/src/rotate.ptr differ diff --git a/vcl/os2/source/src/tblsele.ptr b/vcl/os2/source/src/tblsele.ptr index 2644a04a50bd..ee2d2f027567 100644 Binary files a/vcl/os2/source/src/tblsele.ptr and b/vcl/os2/source/src/tblsele.ptr differ diff --git a/vcl/os2/source/src/tblsels.ptr b/vcl/os2/source/src/tblsels.ptr index 93231f18409e..305ade0c2367 100644 Binary files a/vcl/os2/source/src/tblsels.ptr and b/vcl/os2/source/src/tblsels.ptr differ diff --git a/vcl/os2/source/src/tblselse.ptr b/vcl/os2/source/src/tblselse.ptr index a43f6c8e2f07..d7b6c49b43ee 100644 Binary files a/vcl/os2/source/src/tblselse.ptr and b/vcl/os2/source/src/tblselse.ptr differ diff --git a/vcl/os2/source/src/tblselsw.ptr b/vcl/os2/source/src/tblselsw.ptr index 174d30a3b861..1e9774474ce6 100644 Binary files a/vcl/os2/source/src/tblselsw.ptr and b/vcl/os2/source/src/tblselsw.ptr differ diff --git a/vcl/os2/source/src/tblselw.ptr b/vcl/os2/source/src/tblselw.ptr index ab092ce1d76b..a429773b4dd5 100644 Binary files a/vcl/os2/source/src/tblselw.ptr and b/vcl/os2/source/src/tblselw.ptr differ diff --git a/vcl/os2/source/src/vshear.ptr b/vcl/os2/source/src/vshear.ptr index f335d5ea949b..37d751416f70 100644 Binary files a/vcl/os2/source/src/vshear.ptr and b/vcl/os2/source/src/vshear.ptr differ diff --git a/vcl/os2/source/src/vtext.ptr b/vcl/os2/source/src/vtext.ptr index a7f9901bdf68..ba7567fd6ea0 100644 Binary files a/vcl/os2/source/src/vtext.ptr and b/vcl/os2/source/src/vtext.ptr differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2 vcl/WinResTarget_vcl.mk
dev/null |binary vcl/WinResTarget_vcl.mk| 79 + vcl/os2/source/src/salsrc.rc |2 vcl/os2/source/src/sd.ico |binary vcl/os2/source/window/salframe.cxx |5 -- 5 files changed, 82 insertions(+), 4 deletions(-) New commits: commit 95ffa87a5b4bf0dd04a9116eefeae287d3c22451 Author: Yuri Dario AuthorDate: Tue Sep 11 14:01:55 2018 + Commit: Yuri Dario CommitDate: Tue Sep 11 14:01:55 2018 + #i127815# use new app icon for OS/2 windows. Always set icon for frame windows. Add dependancies list to build system. diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index b6c5c5ae3a6c..2d41e5448a9e 100755 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -126,6 +126,85 @@ $(eval $(call gb_WinResTarget_add_file,vcl/src,\ vcl/os2/source/src/salsrc \ )) +$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ +vcl/os2/source/src/airbrush.ptr \ +vcl/os2/source/src/ase.ptr \ +vcl/os2/source/src/asn.ptr \ +vcl/os2/source/src/asne.ptr \ +vcl/os2/source/src/asns.ptr \ +vcl/os2/source/src/asnswe.ptr \ +vcl/os2/source/src/asnw.ptr \ +vcl/os2/source/src/ass.ptr \ +vcl/os2/source/src/asse.ptr \ +vcl/os2/source/src/assw.ptr \ +vcl/os2/source/src/asw.ptr \ +vcl/os2/source/src/aswe.ptr \ +vcl/os2/source/src/chain.ptr \ +vcl/os2/source/src/chainnot.ptr \ +vcl/os2/source/src/chart.ptr \ +vcl/os2/source/src/copydata.ptr \ +vcl/os2/source/src/copydlnk.ptr \ +vcl/os2/source/src/copyf.ptr \ +vcl/os2/source/src/copyf2.ptr \ +vcl/os2/source/src/copyflnk.ptr \ +vcl/os2/source/src/crook.ptr \ +vcl/os2/source/src/crop.ptr \ +vcl/os2/source/src/cross.ptr \ +vcl/os2/source/src/darc.ptr \ +vcl/os2/source/src/dbezier.ptr \ +vcl/os2/source/src/dcapt.ptr \ +vcl/os2/source/src/dcirccut.ptr \ +vcl/os2/source/src/dconnect.ptr \ +vcl/os2/source/src/dellipse.ptr \ +vcl/os2/source/src/detectiv.ptr \ +vcl/os2/source/src/dfree.ptr \ +vcl/os2/source/src/dline.ptr \ +vcl/os2/source/src/dpie.ptr \ +vcl/os2/source/src/dpolygon.ptr \ +vcl/os2/source/src/drect.ptr \ +vcl/os2/source/src/dtext.ptr \ +vcl/os2/source/src/dtext.ptr \ +vcl/os2/source/src/fill.ptr \ +vcl/os2/source/src/hand.ptr \ +vcl/os2/source/src/help.ptr \ +vcl/os2/source/src/hshear.ptr \ +vcl/os2/source/src/hsizebar.ptr \ +vcl/os2/source/src/hsplit.ptr \ +vcl/os2/source/src/linkdata.ptr \ +vcl/os2/source/src/linkf.ptr \ +vcl/os2/source/src/magnify.ptr \ +vcl/os2/source/src/mirror.ptr \ +vcl/os2/source/src/move.ptr \ +vcl/os2/source/src/movebw.ptr \ +vcl/os2/source/src/movedata.ptr \ +vcl/os2/source/src/movedlnk.ptr \ +vcl/os2/source/src/movef.ptr \ +vcl/os2/source/src/movef2.ptr \ +vcl/os2/source/src/moveflnk.ptr \ +vcl/os2/source/src/movept.ptr \ +vcl/os2/source/src/nullptr.ptr \ +vcl/os2/source/src/pen.ptr \ +vcl/os2/source/src/pivotcol.ptr \ +vcl/os2/source/src/pivotfld.ptr \ +vcl/os2/source/src/pivotrow.ptr \ +vcl/os2/source/src/pntbrsh.ptr \ +vcl/os2/source/src/refhand.ptr \ +vcl/os2/source/src/rotate.ptr \ +vcl/os2/source/src/salsrc.rc \ +vcl/os2/source/src/sd.ico \ +vcl/os2/source/src/tblsele.ptr \ +vcl/os2/source/src/tblsels.ptr \ +vcl/os2/source/src/tblselse.ptr \ +vcl/os2/source/src/tblselsw.ptr \ +vcl/os2/source/src/tblselw.ptr \ +vcl/os2/source/src/timemove.ptr \ +vcl/os2/source/src/timesize.ptr \ +vcl/os2/source/src/vshear.ptr \ +vcl/os2/source/src/vsizebar.ptr \ +vcl/os2/source/src/vsplit.ptr \ +vcl/os2/source/src/vtext.ptr \ +)) + $(eval $(call gb_WinResTarget_set_include,vcl/src,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/os2/source/src \ diff --git a/vcl/os2/source/src/salsrc.rc b/vcl/os2/source/src/salsrc.rc index 2b79cc19faa6..8665a3bd5f9c 100644 --- a/vcl/os2/source/src/salsrc.rc +++ b/vcl/os2/source/src/salsrc.rc @@ -100,5 +100,5 @@ POINTER SAL_RESID_POINTER_TAB_SELECT_W TBLSELW.PTR POINTERSAL_RESID_POINTER_TAB_SELECT_SW TBLSELSW.PTR POINTERSAL_RESID_POINTER_PAINTBRUSHPNTBRSH.PTR -ICON SAL_RESID_ICON_DEFAULT SD2.ICO +ICON SAL_RESID_ICON_DEFAULT SD.ICO diff --git a/vcl/os2/source/src/sd.ico b/vcl/os2/source/src/sd.ico index 22cb33630b85..ed465679c280 100644 Binary files a/vcl/os2/source/src/sd.ico and b/vcl/os2/source/src/sd.ico differ diff --git a/vcl/os2/source/src/sd2.ico b/vcl/os2/source/src/sd2.ico deleted file mode 100644 index f7edd4524bc1.. Binary files a/vcl/os2/source/src/sd2.ico and /dev/null differ diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx index 0e7887f90ef4..84c744904bcf
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2
vcl/os2/source/gdi/salprn.cxx | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
New commits:
commit 034ca8fdc5b4c90aa3047682c06187cfc6757a29
Author: Yuri Dario yda...@apache.org
Date: Sun Feb 23 16:44:37 2014 +
#i124294# use rAppName to fill pszComment field when opening the printer
device.
diff --git a/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index b98694e..a71bf0a 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.cxx
@@ -1671,25 +1671,9 @@ sal_Bool Os2SalPrinter::StartJob( const XubString*
pFileName,
lType = OD_QUEUED;
}
-#if 0 // YD FIXME
-// Set comment (AppName nur bis zum 1. Space-Zeichen nehmen)
-const xub_Unicode* pComment = rAppName;
-USHORT nCommentLen = 0;
-memset( maCommentBuf, 0, sizeof( maCommentBuf ) );
-while ( (nCommentLen 32)
-(((*pComment = 'a') (*pComment = 'z')) ||
- ((*pComment = 'A') (*pComment = 'Z')) ||
- ((*pComment = '0') (*pComment = '9')) ||
- (*pComment == '-')))
-{
-maCommentBuf[nCommentLen] = (char)(*pComment);
-nCommentLen++;
-pComment++;
-}
-aDevOpenStruc.pszComment = (PSZ)maCommentBuf;
-#endif
-ByteString jobName( rJobName, gsl_getSystemTextEncoding());
-aDevOpenStruc.pszComment = (PSZ)jobName.GetBuffer();
+// Set comment using application name
+ByteString appName( rAppName, gsl_getSystemTextEncoding());
+aDevOpenStruc.pszComment = (PSZ)appName.GetBuffer();
// Kopien
if ( nCopies 1 )
@@ -1740,6 +1724,7 @@ sal_Bool Os2SalPrinter::StartJob( const XubString*
pFileName,
#endif
// JobName ermitteln und Job starten
+ByteString jobName( rJobName, gsl_getSystemTextEncoding());
PSZ pszJobName = NULL;
int nJobNameLen = 0;
if ( jobName.Len() 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2
vcl/os2/source/gdi/salprn.cxx | 136 +-
1 file changed, 94 insertions(+), 42 deletions(-)
New commits:
commit 950dbaff38ff81ea3ddf5157e83c7391774f34ab
Author: Yuri Dario yda...@apache.org
Date: Sat Aug 10 09:41:32 2013 +
i122990 - implemented missing InitPaperFormats and GetLandscapeAngle
methods.
diff --git a/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index 6294579..b98694e 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.cxx
@@ -57,32 +57,8 @@
#include print.h
#include jobset.h
-/*
-#include com/sun/star/ui/dialogs/TemplateDescription.hpp
-#include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
-#include com/sun/star/ui/dialogs/XFilePicker.hpp
-#include com/sun/star/ui/dialogs/XFilterManager.hpp
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-#include com/sun/star/lang/XInitialization.hpp
-#include comphelper/processfactory.hxx
-*/
-
#include malloc.h
-/*
-#define _SV_SALPRN_CXX
-#include tools/debug.hxx
-#include saldata.hxx
-#include salinst.h
-#include salgdi.h
-#include salframe.h
-#include vcl/salptype.hxx
-#include salprn.h
-#include vcl/print.h
-#include vcl/jobset.h
-
-*/
-
#ifndef __H_FT2LIB
#include os2/wingdi.h
#include ft2lib.h
@@ -583,11 +559,15 @@ static void ImplFreeFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter )
static void ImplGetFormAndTrayList( Os2SalInfoPrinter* pOs2SalInfoPrinter,
const ImplJobSetup* pSetupData )
{
+// if not defined, suppose default orientation is portrait
+Orientation orientation = ORIENTATION_PORTRAIT;
+
ImplFreeFormAndTrayList( pOs2SalInfoPrinter );
LONG alQuery[] =
{
0, 0, // First two members of QUERYSIZE
+DJP_SJ_ORIENTATION, DJP_CURRENT,
DJP_CJ_FORM,DJP_ALL,
DJP_CJ_TRAYNAME,DJP_ALL,
DJP_NONE, DJP_NONE// EOL marker
@@ -638,7 +618,18 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter, const
PQUERYTUPLE pTuple = pQuerySize-aTuples;
while ( DJP_NONE != pTuple-ulProperty )
{
-if ( pDJP-ulProperty == DJP_CJ_FORM )
+if ( pDJP-ulProperty == DJP_SJ_ORIENTATION )
+{
+if ( pDJP-ulNumReturned )
+{
+PDJPT_ORIENTATION pElm = DJP_ELEMENTP( *pDJP,
DJPT_ORIENTATION );
+if ( (DJP_ORI_PORTRAIT == *pElm) || (DJP_ORI_REV_PORTRAIT
== *pElm) )
+orientation = ORIENTATION_PORTRAIT;
+else
+orientation = ORIENTATION_LANDSCAPE;
+}
+}
+else if ( pDJP-ulProperty == DJP_CJ_FORM )
{
if ( pDJP-ulNumReturned )
{
@@ -649,11 +640,20 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter, const
for( int i = 0; i pDJP-ulNumReturned; i++, pElm++ )
{
ImplFormInfo* pInfo = new ImplFormInfo;
-pInfo-mnPaperWidth = pElm-hcInfo.cx;
-pInfo-mnPaperHeight= pElm-hcInfo.cy;
+// AOO expects form size always in portrait mode
+if (orientation == ORIENTATION_PORTRAIT)
+{
+pInfo-mnPaperWidth = pElm-hcInfo.cx;
+pInfo-mnPaperHeight= pElm-hcInfo.cy;
+}
+else
+{
+pInfo-mnPaperWidth = pElm-hcInfo.cy;
+pInfo-mnPaperHeight= pElm-hcInfo.cx;
+}
#if OSL_DEBUG_LEVEL0
-printf(ImplGetFormAndTrayList mnPaperWidth %d\n,
pInfo-mnPaperWidth);
-printf(ImplGetFormAndTrayList mnPaperHeight %d\n,
pInfo-mnPaperHeight);
+debug_printf(ImplGetFormAndTrayList #%d: %d x %d,
+ i, pInfo-mnPaperWidth,
pInfo-mnPaperHeight);
#endif
pInfo-mnId = pElm-djppsFormID;
pOs2SalInfoPrinter-mpFormArray[i] = pInfo;
@@ -865,6 +865,9 @@ static sal_Bool ImplSetOrientation( HDC hPrinterDC,
PDRIVDATA pDriverData,
DJP_SJ_ORIENTATION, DJP_CURRENT,
DJP_NONE, DJP_NONE// EOL marker
};
+#if OSL_DEBUG_LEVEL0
+debug_printf( ImplSetOrientation mhDC %x, %d, hPrinterDC, eOrientation);
+#endif
APIRET rc;
PQUERYSIZE pQuerySize = (PQUERYSIZE)alQuery;
@@ -1164,6 +1167,7 @@ Os2SalInfoPrinter::Os2SalInfoPrinter()
mpFormArray = NULL;
mnTrayCount = 0;
mpTrayArray = NULL;
+m_bPapersInit = FALSE;
}
// ---
@@ -1181,6 +1185,42 @@
