Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx Fri Jul 19 15:59:04 2013 @@ -1244,19 +1244,31 @@ Size GtkSalFrame::calcDefaultSize() long w = aScreenSize.Width(); long h = aScreenSize.Height(); - // fill in holy default values brought to us by product management - if( aScreenSize.Width() >= 800 ) - w = 785; - if( aScreenSize.Width() >= 1024 ) - w = 920; - - if( aScreenSize.Height() >= 600 ) - h = 550; - if( aScreenSize.Height() >= 768 ) - h = 630; - if( aScreenSize.Height() >= 1024 ) - h = 875; - + + if (aScreenSize.Width() <= 1024 || aScreenSize.Height() <= 768) + { + // For small screen use the old default values. Original comment: + // fill in holy default values brought to us by product management + if( aScreenSize.Width() >= 800 ) + w = 785; + if( aScreenSize.Width() >= 1024 ) + w = 920; + + if( aScreenSize.Height() >= 600 ) + h = 550; + if( aScreenSize.Height() >= 768 ) + h = 630; + if( aScreenSize.Height() >= 1024 ) + h = 875; + } + else + { + // Use the same size calculation as on Mac OSX: 80% of width + // and height. + w = static_cast<long>(aScreenSize.Width() * 0.8); + h = static_cast<long>(aScreenSize.Height() * 0.8); + } + return Size( w, h ); }
Modified: openoffice/branches/rejuvenate01/main/wizards/com/sun/star/wizards/common/NumberFormatter.java URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/wizards/com/sun/star/wizards/common/NumberFormatter.java?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/wizards/com/sun/star/wizards/common/NumberFormatter.java (original) +++ openoffice/branches/rejuvenate01/main/wizards/com/sun/star/wizards/common/NumberFormatter.java Fri Jul 19 15:59:04 2013 @@ -197,7 +197,8 @@ public class NumberFormatter Locale oLocale = (Locale) Helper.getUnoPropertyValue(xNumberFormat, "Locale"); int NewFormatKey = defineNumberFormat(FormatString, oLocale); XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, _xFormatObject); - xPSet.setPropertyValue("FormatsSupplier", _oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier()); + if (xPSet.getPropertySetInfo().hasPropertyByName("FormatsSupplier")) + xPSet.setPropertyValue("FormatsSupplier", _oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier()); if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat")) { xPSet.setPropertyValue("NumberFormat", new Integer(NewFormatKey)); Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx (original) +++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx Fri Jul 19 15:59:04 2013 @@ -68,10 +68,8 @@ void OOXMLDocumentImpl::resolveFastSubSt { uno::Reference<uno::XComponentContext> xContext(mpStream->getContext()); OOXMLFastDocumentHandler * pDocHandler = - new OOXMLFastDocumentHandler(xContext); - pDocHandler->setStream(&rStreamHandler); - pDocHandler->setDocument(this); - pDocHandler->setXNoteId(msXNoteId); + new OOXMLFastDocumentHandler( + xContext, &rStreamHandler, this, msXNoteId ); uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler (pDocHandler); @@ -317,10 +315,8 @@ void OOXMLDocumentImpl::resolve(Stream & uno::Reference<uno::XComponentContext> xContext(mpStream->getContext()); OOXMLFastDocumentHandler * pDocHandler = - new OOXMLFastDocumentHandler(xContext); - pDocHandler->setStream(&rStream); - pDocHandler->setDocument(this); - pDocHandler->setXNoteId(msXNoteId); + new OOXMLFastDocumentHandler( + xContext, &rStream, this, msXNoteId ); pDocHandler->setIsSubstream( mbIsSubstream ); uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler (pDocHandler); Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx (original) +++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx Fri Jul 19 15:59:04 2013 @@ -39,10 +39,28 @@ using namespace ::com::sun::star; using namespace ::std; -OOXMLFastDocumentHandler::OOXMLFastDocumentHandler -(uno::Reference< uno::XComponentContext > const & context) -: m_xContext(context) -{} +OOXMLFastDocumentHandler::OOXMLFastDocumentHandler( + uno::Reference< uno::XComponentContext > const & context, + Stream* pStream, + OOXMLDocument* pDocument, + const ::rtl::OUString& rXNoteId ) + : m_xContext(context) + , mpStream( pStream ) +#ifdef DEBUG_ELEMENT + , mpTmpStream() +#endif + , mpDocument( pDocument ) + , msXNoteId( rXNoteId ) + , mpContextHandler() +{ +#ifdef DEBUG_PROTOCOL + if ( pStream ) + { + mpTmpStream.reset( new StreamProtocol( pStream, debug_logger ) ); + mpStream = mpTmpStream.get(); + } +#endif +} // ::com::sun::star::xml::sax::XFastContextHandler: void SAL_CALL OOXMLFastDocumentHandler::startFastElement @@ -144,7 +162,14 @@ uno::Reference< xml::sax::XFastContextHa << fastTokenToId(Element) << endl; #endif - + + if ( mpStream == 0 && mpDocument == 0 ) + { + // document handler has been created as unknown child - see <OOXMLFastDocumentHandler::createUnknownChildContext(..)> + // --> do not provide a child context + return NULL; + } + return OOXMLFactory::getInstance()->createFastChildContextFromStart(getContextHandler().get(), Element); } @@ -171,13 +196,12 @@ Name #endif return uno::Reference< xml::sax::XFastContextHandler > - (new OOXMLFastDocumentHandler(m_xContext)); + ( new OOXMLFastDocumentHandler( m_xContext, 0, 0, ::rtl::OUString() ) ); } void SAL_CALL OOXMLFastDocumentHandler::characters(const ::rtl::OUString & /*aChars*/) throw (uno::RuntimeException, xml::sax::SAXException) { - // TODO: Insert your implementation for "characters" here. } // ::com::sun::star::xml::sax::XFastDocumentHandler: @@ -195,32 +219,14 @@ void SAL_CALL OOXMLFastDocumentHandler:: (const uno::Reference< xml::sax::XLocator > & /*xLocator*/) throw (uno::RuntimeException, xml::sax::SAXException) { - // TODO: Insert your implementation for "setDocumentLocator" here. -} - -void OOXMLFastDocumentHandler::setStream(Stream * pStream) -{ -#ifdef DEBUG_PROTOCOL - mpTmpStream.reset(new StreamProtocol(pStream, debug_logger)); - mpStream = mpTmpStream.get(); -#else - mpStream = pStream; -#endif -} - -void OOXMLFastDocumentHandler::setDocument(OOXMLDocument * pDocument) -{ - mpDocument = pDocument; -} - -void OOXMLFastDocumentHandler::setXNoteId(const ::rtl::OUString & rXNoteId) -{ - msXNoteId = rXNoteId; } void OOXMLFastDocumentHandler::setIsSubstream( bool bSubstream ) { - getContextHandler( )->getParserState( )->setInSectionGroup( bSubstream ); + if ( mpStream != 0 && mpDocument != 0 ) + { + getContextHandler( )->getParserState( )->setInSectionGroup( bSubstream ); + } } }} Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx (original) +++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx Fri Jul 19 15:59:04 2013 @@ -44,8 +44,11 @@ class OOXMLFastDocumentHandler: xml::sax::XFastDocumentHandler> { public: - OOXMLFastDocumentHandler - (uno::Reference< uno::XComponentContext > const & context); + OOXMLFastDocumentHandler( + uno::Reference< uno::XComponentContext > const & context, + Stream* pStream, + OOXMLDocument* pDocument, + const ::rtl::OUString& rXNoteId ); virtual ~OOXMLFastDocumentHandler() {} // ::com::sun::star::xml::sax::XFastDocumentHandler: @@ -86,11 +89,7 @@ public: throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); - - void setStream(Stream * pStream); - void setDocument(OOXMLDocument * pDocument); - void setXNoteId(const ::rtl::OUString & rXNoteId); - + void setIsSubstream( bool bSubstream ); private: Modified: openoffice/branches/rejuvenate01/main/xmlsecurity/source/dialogs/warnings.src URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmlsecurity/source/dialogs/warnings.src?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/xmlsecurity/source/dialogs/warnings.src (original) +++ openoffice/branches/rejuvenate01/main/xmlsecurity/source/dialogs/warnings.src Fri Jul 19 15:59:04 2013 @@ -75,7 +75,7 @@ ModalDialog RID_XMLSECTP_MACROWARN Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 ); Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT ); Wordbreak = TRUE; - Text [ en-US ] = "Macros may contain viruses. Disabling macros for a document is always save. If you disable macros you may lose functionality provided by the document macros."; + Text [ en-US ] = "Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros."; }; CheckBox CB_ALWAYSTRUST { Propchange: openoffice/branches/rejuvenate01/test/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test:r1488189-1504851 Propchange: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1488189-1504851 Modified: openoffice/branches/rejuvenate01/test/testuno/.classpath_linux URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/test/testuno/.classpath_linux?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/test/testuno/.classpath_linux (original) +++ openoffice/branches/rejuvenate01/test/testuno/.classpath_linux Fri Jul 19 15:59:04 2013 @@ -4,10 +4,10 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/testcommon"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> - <classpathentry kind="var" path="openoffice.home"/> - <classpathentry kind="var" path="openoffice.home/basis-link/program/classes/unoil.jar"/> - <classpathentry kind="var" path="openoffice.home/basis-link/ure-link/share/java/jurt.jar"/> - <classpathentry kind="var" path="openoffice.home/basis-link/ure-link/share/java/juh.jar"/> - <classpathentry kind="var" path="openoffice.home/basis-link/ure-link/share/java/ridl.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes"/> + <classpathentry kind="var" path="openoffice.home/program/classes/unoil.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes/jurt.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes/juh.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes/ridl.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: openoffice/branches/rejuvenate01/test/testuno/.classpath_win URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/test/testuno/.classpath_win?rev=1504925&r1=1504924&r2=1504925&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/test/testuno/.classpath_win (original) +++ openoffice/branches/rejuvenate01/test/testuno/.classpath_win Fri Jul 19 15:59:04 2013 @@ -4,10 +4,10 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/testcommon"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> - <classpathentry kind="var" path="openoffice.home"/> - <classpathentry kind="var" path="openoffice.home/Basis/program/classes/unoil.jar"/> - <classpathentry kind="var" path="openoffice.home/URE/java/jurt.jar"/> - <classpathentry kind="var" path="openoffice.home/URE/java/juh.jar"/> - <classpathentry kind="var" path="openoffice.home/URE/java/ridl.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes"/> + <classpathentry kind="var" path="openoffice.home/program/classes/unoil.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes/jurt.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes/juh.jar"/> + <classpathentry kind="var" path="openoffice.home/program/classes/ridl.jar"/> <classpathentry kind="output" path="bin"/> </classpath>
