-- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From 17b84c4746cd782b3ecf3b28166f0ccabcbb6079 Mon Sep 17 00:00:00 2001 From: Philipp Lohmann Date: Mon, 20 Apr 2009 16:57:13 +0000 Subject: CWS-TOOLING: rebase CWS printerpullpages to trunk@270723 (milestone: DEV300:m46) --- .../OpenOfficeorg/javavendors_linux.xml | 2 +- .../OpenOfficeorg/javavendors_macosx.xml | 2 +- .../OpenOfficeorg/javavendors_os2.xml | 2 +- .../OpenOfficeorg/javavendors_unx.xml | 4 +-- .../OpenOfficeorg/javavendors_wnt.xml | 2 +- jvmfwk/inc/jvmfwk/framework.h | 21 +++++++++++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 36 +++++++++++++++++----- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 3 +- jvmfwk/source/framework.cxx | 30 ++++++++++++++++++ jvmfwk/source/framework.map | 5 +++ sal/typesconfig/typesconfig.c | 31 ++++++++++++++----- stoc/source/javavm/javavm.cxx | 33 +++++++++++++++++--- store/source/lockbyte.cxx | 12 +++++++- store/source/storbase.hxx | 2 +- store/source/stordata.hxx | 4 +-- store/source/storlckb.cxx | 6 ++-- store/source/stortree.cxx | 6 ++-- store/source/stortree.hxx | 2 ++ store/workben/t_file.cxx | 25 +++++++++++++++ store/workben/t_page.cxx | 4 +-- 20 files changed, 194 insertions(+), 38 deletions(-) diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index f3bf44addc25..ed329e5788d3 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -3,7 +3,7 @@ - 2008-01-16 + 2004-01-30 diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 1d7894a11025..215d26c0ea2a 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -3,7 +3,7 @@ - 2008-01-16 + 2006-05-02 diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml index 5ba2eaf76251..372254d4ee71 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml @@ -3,7 +3,7 @@ - 2008-01-16 + 2004-01-30 diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index b9b8296edf8f..3b1f53fc4fce 100755 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -3,7 +3,7 @@ - 2008-01-16 + 2004-01-30 @@ -14,4 +14,4 @@ vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so - \ No newline at end of file + diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 47a5800659ca..a72216d66646 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -3,7 +3,7 @@ - 2008-01-16 + 2004-01-30 diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 49516f554e21..4082adba0a5f 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -815,6 +815,27 @@ javaFrameworkError SAL_CALL jfw_setJRELocations( javaFrameworkError SAL_CALL jfw_getJRELocations( rtl_uString *** parLocations, sal_Int32 * pSize); + +/** checks if the installation of the jre still exists. + + This function checks if the JRE described by pInfo still + exists. The check must be very quick because it is called by javaldx + (Linux, Solaris) at start up. + + @param pInfo + [in] the JavaInfo object with information about the JRE. + @param pp_exist + [out] the parameter is set to either sal_True or sal_False. The value is + only valid if the function returns JFW_E_NONE. + + @return + JFW_E_NONE the function ran successfully.
+ JFW_E_ERROR an error occurred during execution.
+ JFW_E_INVALID_ARG pInfo contains invalid data
+ */ +javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist); + + /** locks this API so that it cannot be used by other threads.

If a different thread called this function before then the diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 762497b8d8bc..1a6f99f65ba4 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -46,6 +46,7 @@ using namespace rtl; static sal_Bool hasOption(char const * szOption, int argc, char** argv); static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData); +static bool findAndSelect(JavaInfo**); //static sal_Bool printPaths(const OUString& sPathFile); #define HELP_TEXT \ @@ -95,15 +96,22 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (pInfo == NULL) { - errcode = jfw_findAndSelectJRE( & pInfo); - if (errcode == JFW_E_NO_JAVA_FOUND) + if (false == findAndSelect(&pInfo)) + return -1; + } + else + { + //check if the JRE was not uninstalled + sal_Bool bExist = sal_False; + errcode = jfw_existJRE(pInfo, &bExist); + if (errcode == JFW_E_NONE) { - fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n"); - return 0; + if (false == findAndSelect(&pInfo)) + return -1; } - else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE) + else { - fprintf(stderr,"javaldx failed!\n"); + fprintf(stderr, "javaldx: Could not determine if JRE still exist\n"); return -1; } } @@ -162,7 +170,21 @@ static sal_Bool hasOption(char const * szOption, int argc, char** argv) return retVal; } - +static bool findAndSelect(JavaInfo ** ppInfo) +{ + javaFrameworkError errcode = jfw_findAndSelectJRE(ppInfo); + if (errcode == JFW_E_NO_JAVA_FOUND) + { + fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n"); + return false; + } + else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE) + { + fprintf(stderr,"javaldx failed!\n"); + return false; + } + return true; +} diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 083739078bf0..f3586af32bb5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -110,8 +110,7 @@ bool SunVersion::init(const char *szVersion) ! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit && ( //seperators after maintainance (1.4.1_01, 1.4.1-beta, or1.4.1 - (pCur == pEnd || *pCur == '_' || *pCur == '-') - && (nPart == 2 ) + ((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 )) || //separators between major-minor and minor-maintainance (nPart < 2 && *pCur == '.') ) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 75a20ac98ff3..933e5e10ea09 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -34,6 +34,7 @@ #include "rtl/ustring.hxx" #include "rtl/bootstrap.hxx" #include "osl/thread.hxx" +#include "osl/file.hxx" #include "osl/module.hxx" #include "jvmfwk/framework.h" #include "jvmfwk/vendorplugin.h" @@ -1113,6 +1114,35 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( return errcode; } + +javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) +{ + javaFrameworkError ret = JFW_E_NONE; + if (!pInfo || !exist) + return JFW_E_INVALID_ARG; + ::rtl::OUString sLocation(pInfo->sLocation); + + if (sLocation.getLength() == 0) + return JFW_E_INVALID_ARG; + + ::osl::DirectoryItem item; + ::osl::File::RC rc_item = ::osl::DirectoryItem::get(sLocation, item); + if (::osl::File::E_None == rc_item) + { + *exist = sal_True; + } + else if (::osl::File::E_NOENT == rc_item) + { + *exist = sal_False; + } + else + { + ret = JFW_E_ERROR; + } + + return ret; +} + void SAL_CALL jfw_lock() { jfw::FwkMutex::get().acquire(); diff --git a/jvmfwk/source/framework.map b/jvmfwk/source/framework.map index 2ce5d22b61dc..c95cc83aa826 100644 --- a/jvmfwk/source/framework.map +++ b/jvmfwk/source/framework.map @@ -24,3 +24,8 @@ UDK_3_0_0 { local: *; }; + +UDK_3.1 { # OOo 3.1.0 + global: + jfw_existJRE; +} UDK_3_0_0; diff --git a/sal/typesconfig/typesconfig.c b/sal/typesconfig/typesconfig.c index be02052378ae..932d80fd979a 100644 --- a/sal/typesconfig/typesconfig.c +++ b/sal/typesconfig/typesconfig.c @@ -163,20 +163,37 @@ int check( TestFunc func, Type eT, void* p ) |* Letzte Aenderung |* *************************************************************************/ -static int dummy(void* unused); +#if defined(IA64) || defined(ARM32) + +int forceerror() +{ +#if defined(ARM32) +// workaround for qemu-user + hit = 1; +#else + raise (SIGBUS); +#endif + return 1; +} int GetAtAddress( Type eT, void* p ) { -#if defined(IA64) || defined(ARM32) switch ( eT ) { case t_char: return *((char*)p); - case t_short: if ((long)p % sizeof(short)) abort(); else return *((short*)p); - case t_int: if ((long)p % sizeof(int)) abort(); else return *((int*)p); - case t_long: if ((long)p % sizeof(long)) abort(); else return *((long*)p); - case t_double: if ((long)p % sizeof(double)) abort(); else return *((double*)p); + case t_short: if ((long)p % sizeof(short)) return forceerror(); else return *((short*)p); + case t_int: if ((long)p % sizeof(int)) return forceerror(); else return *((int*)p); + case t_long: if ((long)p % sizeof(long)) return forceerror(); else return *((long*)p); + case t_double: if ((long)p % sizeof(double)) return forceerror(); else return *((double*)p); } + abort(); +} + #else +static int dummy(void* unused); + +int GetAtAddress( Type eT, void* p ) +{ switch ( eT ) { case t_char: { char x = *(char*)p; return dummy(&x); } @@ -185,7 +202,6 @@ int GetAtAddress( Type eT, void* p ) case t_long: { long x = *(long*)p; return dummy(&x); } case t_double: { double x = *(double*)p; return dummy(&x); } } -#endif abort(); } @@ -195,6 +211,7 @@ int dummy(void* unused) return 0; } +#endif /************************************************************************* |* |* SetAtAddress() diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index e7c9ff1a5851..8042b70c9dd1 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -881,11 +881,34 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } case JFW_E_VM_CREATION_FAILED: { - //Error: - //%PRODUCTNAME requires a Java runtime environment (JRE) to perform - //this task. The selected JRE is defective. Please select another - //version or install a new JRE and select it under Tools - Options - - //%PRODUCTNAME - Java. + //If the creation failed because the JRE has been uninstalled then + //we search another one. As long as there is a javaldx, we should + //never come into this situation. javaldx checks alway if the JRE + //still exist. + JavaInfo * pJavaInfo = NULL; + if (JFW_E_NONE == jfw_getSelectedJRE(&pJavaInfo)) + { + sal_Bool bExist = sal_False; + if (JFW_E_NONE == jfw_existJRE(pJavaInfo, &bExist)) + { + if (bExist == sal_False + && ! (pJavaInfo->nRequirements & JFW_REQUIRE_NEEDRESTART)) + { + javaFrameworkError errFind = jfw_findAndSelectJRE( NULL ); + if (errFind == JFW_E_NONE) + { + continue; + } + } + } + } + + jfw_freeJavaInfo(pJavaInfo); + // + //Error: %PRODUCTNAME requires a Java + //runtime environment (JRE) to perform this task. The selected JRE + //is defective. Please select another version or install a new JRE + //and select it under Tools - Options - %PRODUCTNAME - Java. css::java::JavaVMCreationFailureException exc( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index ef97f129538d..a38aa768908d 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -41,6 +41,7 @@ #include "sal/types.h" #include "osl/diagnose.h" #include "osl/file.h" +#include "osl/process.h" #include "rtl/alloc.h" #include "rtl/ustring.hxx" @@ -278,9 +279,18 @@ struct FileHandle rtl::OUString aFileUrl; if (osl_getFileURLFromSystemPath (pFilename, &(aFileUrl.pData)) != osl_File_E_None) { - // Not system path. Maybe a file url, already. + // Not system path. Assume file url. rtl_uString_assign (&(aFileUrl.pData), pFilename); } + if (aFileUrl.compareToAscii("file://", 7) != 0) + { + // Not file url. Assume relative path. + rtl::OUString aCwdUrl; + (void) osl_getProcessWorkingDir (&(aCwdUrl.pData)); + + // Absolute file url. + (void) osl_getAbsoluteFileURL (aCwdUrl.pData, aFileUrl.pData, &(aFileUrl.pData)); + } // Acquire handle. oslFileError result = osl_openFile (aFileUrl.pData, &m_handle, nFlags); diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 167302d7bedd..04be2860f691 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -910,7 +910,7 @@ protected: public: template< class U > - PageHolderObject get() const + PageHolderObject makeHolder() const { return PageHolderObject(m_xPage); } diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx index 4610db5ac908..1b6c74c371fd 100644 --- a/store/source/stordata.hxx +++ b/store/source/stordata.hxx @@ -836,13 +836,13 @@ private: */ page & PAGE() { - page * pImpl = reinterpret_cast(m_xPage.get()); + page * pImpl = static_cast(m_xPage.get()); OSL_PRECOND(pImpl != 0, "OStoreDirectoryPageObject::PAGE(): Null pointer"); return (*pImpl); } page const & PAGE() const { - page const * pImpl = reinterpret_cast(m_xPage.get()); + page const * pImpl = static_cast(m_xPage.get()); OSL_PRECOND(pImpl != 0, "OStoreDirectoryPageObject::PAGE(): Null pointer"); return (*pImpl); } diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx index 837945d1646c..fc028f1da688 100644 --- a/store/source/storlckb.cxx +++ b/store/source/storlckb.cxx @@ -221,7 +221,7 @@ storeError OStoreLockBytes::readAt ( } else { - PageHolderObject< data > xData (aData.get()); + PageHolderObject< data > xData (aData.makeHolder()); memcpy ( &pData[rnDone], &xData->m_pData[aDescr.m_nOffset], @@ -322,13 +322,13 @@ storeError OStoreLockBytes::writeAt ( } } - PageHolderObject< data > xData (aData.get()); + PageHolderObject< data > xData (aData.makeHolder()); if (!xData.is()) { eErrCode = aData.construct(m_xManager->allocator()); if (eErrCode != store_E_None) return eErrCode; - xData = aData.get(); + xData = aData.makeHolder(); } // Modify data page. diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index 1967c744c66b..614b995aba72 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -127,6 +127,7 @@ void OStoreBTreeNodeData::remove (sal_uInt16 i) } } +#if 0 /* NYI */ /* * merge (with right page). */ @@ -140,6 +141,7 @@ void OStoreBTreeNodeData::merge (const self& rPageR) usageCount (n + m); } } +#endif /* * split (left half copied from right half of left page). @@ -538,7 +540,7 @@ storeError OStoreBTreeRootObject::find_lookup ( // Check current page. PageHolderObject< page > xPage (rNode.get()); - for (; xPage->depth() > 0; xPage = rNode.get< page >()) + for (; xPage->depth() > 0; xPage = rNode.makeHolder< page >()) { // Find next page. page const & rPage = (*xPage); @@ -621,7 +623,7 @@ storeError OStoreBTreeRootObject::find_insert ( // Check current Page. PageHolderObject< page > xPage (rNode.get()); - for (; xPage->depth() > 0; xPage = rNode.get< page >()) + for (; xPage->depth() > 0; xPage = rNode.makeHolder< page >()) { // Find next page. page const & rPage = (*xPage); diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx index ddfe4fecc5bf..9aa5da92cfda 100644 --- a/store/source/stortree.hxx +++ b/store/source/stortree.hxx @@ -224,9 +224,11 @@ struct OStoreBTreeNodeData : public store::OStorePageData void insert (sal_uInt16 i, const T& t); void remove (sal_uInt16 i); +#if 0 /* NYI */ /** merge (with right page). */ void merge (const self& rPageR); +#endif /** split (left half copied from right half of left page). */ diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx index ea7b6bcd37d2..d4feb25651eb 100644 --- a/store/workben/t_file.cxx +++ b/store/workben/t_file.cxx @@ -42,6 +42,9 @@ #define INCLUDED_STDIO_H #endif +#include "osl/file.h" +#include "osl/process.h" + using namespace store; #define TEST_PAGESIZE 16384 @@ -62,6 +65,28 @@ int SAL_CALL main (int argc, char **argv) argv[1], rtl_str_getLength(argv[1]), osl_getThreadTextEncoding()); +#if 0 /* EXP */ + oslFileError result; + rtl::OUString aPath; + + result = osl_getFileURLFromSystemPath(aFilename.pData, &(aPath.pData)); + if (result != osl_File_E_None) + { + // not SystemPath, assume FileUrl. + aPath = aFilename; + } + if (rtl_ustr_ascii_shortenedCompare_WithLength(aPath.pData->buffer, aPath.pData->length, "file://", 7) != 0) + { + // not FileUrl, assume relative path. + rtl::OUString aBase; + (void) osl_getProcessWorkingDir (&(aBase.pData)); + + // absolute FileUrl. + (void) osl_getAbsoluteFileURL(aBase.pData, aPath.pData, &(aPath.pData)); + } + aFilename = aPath; +#endif /* EXP */ + eErrCode = FileLockBytes_createInstance ( xLockBytes, aFilename.pData, store_AccessReadWrite); if (eErrCode != store_E_None) diff --git a/store/workben/t_page.cxx b/store/workben/t_page.cxx index b488e1ac997b..a0645f00bc58 100644 --- a/store/workben/t_page.cxx +++ b/store/workben/t_page.cxx @@ -17,7 +17,7 @@ * *======================================================================*/ -template< class T > inline void swap (T & lhs, T & rhs) +template< class T > void swap (T & lhs, T & rhs) { T tmp = rhs; rhs = lhs; lhs = tmp; } @@ -694,7 +694,7 @@ public: { TestObject aObj; - rBIOS.loadPageAt(aObj.get(), &aObj.verify); + rBIOS.loadPageAt(aObj.get(), aObj.verify); rBIOS.loadPageAt(aObj.get(), TestObject::verify); rBIOS.loadPageAt(aObj.get(), PageHolderObject::verify); -- cgit v1.2.3 -- cgit v1.2.3 From a9912838a6e361e2564f4ef30a5b0f619641dac2 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 10 Aug 2009 15:10:32 +0000 Subject: #i96402# Added DuplexMode constants --- offapi/com/sun/star/view/DuplexMode.idl | 69 +++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 offapi/com/sun/star/view/DuplexMode.idl diff --git a/offapi/com/sun/star/view/DuplexMode.idl b/offapi/com/sun/star/view/DuplexMode.idl new file mode 100644 index 000000000000..47877a8ad960 --- /dev/null +++ b/offapi/com/sun/star/view/DuplexMode.idl @@ -0,0 +1,69 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: PaperFormat.idl,v $ + * $Revision: 1.7 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_view_DuplexMode_idl__ +#define __com_sun_star_view_DuplexMode_idl__ + + +//============================================================================= + +module com { module sun { module star { module view { + +//============================================================================= + +/** These constants specify available duplex modes + */ +constants DuplexMode +{ + //------------------------------------------------------------------------- + /** specifies an unknown duplex mode. + */ + const short UNKNOWN = 0; + + //------------------------------------------------------------------------- + /** specifies that there is no duplex mode enabled + */ + const short OFF = 1; + + //------------------------------------------------------------------------- + /** specifies a long edge duplex mode + */ + const short LONGEDGE = 2; + + //------------------------------------------------------------------------- + /** specifies the paper format as A4. + */ + const short SHORTEDGE = 3; +}; + +//============================================================================= + +}; }; }; }; + +#endif -- cgit v1.2.3 From 216a877272828f919996baf828d7669319b70798 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 10 Aug 2009 15:11:12 +0000 Subject: #i96402# Added DuplexMode constants --- offapi/com/sun/star/view/DuplexMode.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offapi/com/sun/star/view/DuplexMode.idl b/offapi/com/sun/star/view/DuplexMode.idl index 47877a8ad960..6d5d84ff4abc 100644 --- a/offapi/com/sun/star/view/DuplexMode.idl +++ b/offapi/com/sun/star/view/DuplexMode.idl @@ -57,7 +57,7 @@ constants DuplexMode const short LONGEDGE = 2; //------------------------------------------------------------------------- - /** specifies the paper format as A4. + /** specifies a short edge duplex mode */ const short SHORTEDGE = 3; }; -- cgit v1.2.3 From 227e3afb7518e8844788094e2dd6426be6beaa59 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 10 Aug 2009 15:13:59 +0000 Subject: #i96402# Added DuplexMode option --- offapi/com/sun/star/view/PrintOptions.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/offapi/com/sun/star/view/PrintOptions.idl b/offapi/com/sun/star/view/PrintOptions.idl index 6bd67e0f52bd..df65229a0854 100644 --- a/offapi/com/sun/star/view/PrintOptions.idl +++ b/offapi/com/sun/star/view/PrintOptions.idl @@ -85,6 +85,13 @@ published service PrintOptions Otherwhise following actions (as e.g. closing the corresponding model) can fail. */ [optional, property] boolean Wait; + + //------------------------------------------------------------------------- + /** determines the duplex mode for the print job. + + @see DuplexMode for more information about supported values + */ + [optional, property] short DuplexMode; }; //============================================================================= -- cgit v1.2.3 From accedbb3caa51b0d9686dbdef56e17c9fcf4bd99 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 10 Aug 2009 15:14:18 +0000 Subject: #i96402# Added DuplexMode --- offapi/com/sun/star/view/makefile.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/offapi/com/sun/star/view/makefile.mk b/offapi/com/sun/star/view/makefile.mk index 04dbdc77abac..1db50d0ece89 100644 --- a/offapi/com/sun/star/view/makefile.mk +++ b/offapi/com/sun/star/view/makefile.mk @@ -73,7 +73,8 @@ IDLFILES=\ XPrintJobBroadcaster.idl\ XPrintJobListener.idl\ XMultiSelectionSupplier.idl\ - SelectionType.idl + SelectionType.idl\ + DuplexMode.idl # ------------------------------------------------------------------ -- cgit v1.2.3 -- cgit v1.2.3