[Libreoffice-commits] .: configure.in
configure.in | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) New commits: commit cf33de27eb5e981d8a1fa76f6a9d72ce7174f10d Author: James C james.from.welling...@gmail.com Date: Tue Dec 20 02:15:08 2011 -0600 Fix gmake detection for MacOSX diff --git a/configure.in b/configure.in index 84d7b50..120ed1f 100644 --- a/configure.in +++ b/configure.in @@ -2705,7 +2705,19 @@ if test $_make_longver -ge 038200 ; then elif test $_make_longver -ge 038100 ; then AC_MSG_RESULT([$GNUMAKE $_make_version]) AC_MSG_CHECKING([for GNU make bug 20033]) -TESTGMAKEBUG20033=`mktemp -d` +dnl +dnl FIXME: mktemp takes different arguments on different platforms: +dnl http://stackoverflow.com/questions/2792675/how-portable-is-mktemp1 +dnl +dnl -t means either 'use $TMPDIR' (OK) or 'the following is a template'. +dnl and without 'the following is a template', a following template +dnl is allowed, so this *may* work on *most* platforms +dnl +TESTGMAKEBUG20033=`mktemp -d -t MakefileXX` +SHA1SUM=sha1sum +if test $_os = Darwin; then +SHA1SUM=shasum +fi cat $TESTGMAKEBUG20033/Makefile EOF A := \$(wildcard *.a) @@ -2728,7 +2740,7 @@ define d2 endef %.b : %.a - \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\ + \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\ \$(call d1,\$(CHECKSUM)),\ \$(call d2,\$(CHECKSUM))) EOF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.patch | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 275e6c62917bffe65dd6c26f42e42ae6324619fe Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Dec 20 09:58:07 2011 +0100 Disable cairo svg surface on windows to avoid problems with missing header diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index eb0885e..d13c1e4 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,3 +1,14 @@ +--- misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 09:47:30.0 +0200 misc/build/cairo-1.10.2/build/Makefile.win32.features 2011-12-20 09:57:06.428170146 +0100 +@@ -30,7 +30,7 @@ + CAIRO_HAS_FC_FONT=0 + CAIRO_HAS_PS_SURFACE=1 + CAIRO_HAS_PDF_SURFACE=1 +-CAIRO_HAS_SVG_SURFACE=1 ++CAIRO_HAS_SVG_SURFACE=0 + CAIRO_HAS_TEST_SURFACES=0 + CAIRO_HAS_TEE_SURFACE=0 + CAIRO_HAS_XML_SURFACE=0 --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.0 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14 23:53:24.0 +0200 @@ -22,24 +22,26 @@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - l10ntools/source sc/source unusedcode.easy
l10ntools/source/helpex.cxx | 80 +---
sc/source/ui/docshell/docsh.cxx |4 --
sc/source/ui/inc/docsh.hxx |2 -
sc/source/ui/view/printfun.cxx | 21 --
unusedcode.easy |1
5 files changed, 35 insertions(+), 73 deletions(-)
New commits:
commit b0604113bc35c17f84f952ec882c24d61eef30e3
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 22:39:38 2011 +
ByteString-rtl::OString
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index b9c6874..1925285 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -48,17 +48,17 @@
#define STATE_OUTPUTY 0xff
// set of global variables
-ByteString sInputFile;
+rtl::OString sInputFile;
sal_Bool bEnableExport;
sal_Bool bMergeMode;
sal_Bool bErrorLog;
sal_Bool bUTF8;
-ByteString sPrj;
-ByteString sPrjRoot;
-ByteString sOutputFile;
-ByteString sOutputFileX;
-ByteString sOutputFileY;
-ByteString sSDFFile;
+rtl::OString sPrj;
+rtl::OString sPrjRoot;
+rtl::OString sOutputFile;
+rtl::OString sOutputFileX;
+rtl::OString sOutputFileY;
+rtl::OString sSDFFile;
/*/
sal_Bool ParseCommandLine( int argc, char* argv[])
@@ -77,41 +77,36 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
sal_Bool bInput = sal_False;
// parse command line
-for( int i = 1; i argc; i++ ) {
-if ( ByteString( argv[ i ]).ToUpperAscii() == -I ) {
+for( int i = 1; i argc; i++ )
+{
+rtl::OString aArg(rtl::OString(argv[i]).toAsciiUpperCase());
+if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-I)))
nState = STATE_INPUT; // next tokens specifies source files
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -O ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-O)))
nState = STATE_OUTPUT; // next token specifies the dest file
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -X ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-X)))
nState = STATE_OUTPUTX; // next token specifies the dest file
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -Y ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-Y )))
nState = STATE_OUTPUTY; // next token specifies the dest file
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -P ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-P )))
nState = STATE_PRJ; // next token specifies the cur. project
-}
- else if ( ByteString( argv[ i ]).ToUpperAscii() == -LF ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-LF)))
nState = STATE_FORCE_LANGUAGES;
-}
-
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -R ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-R )))
nState = STATE_ROOT; // next token specifies path to project root
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -M ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-M )))
nState = STATE_SDFFILE; // next token specifies the merge database
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -E ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-E )))
+{
nState = STATE_ERRORLOG;
bErrorLog = sal_False;
}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -L ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-L )))
nState = STATE_LANGUAGES;
-}
-else {
-switch ( nState ) {
+else
+{
+switch ( nState )
+{
case STATE_NON: {
return sal_False; // no valid command line
}
@@ -200,57 +195,53 @@ int _cdecl main( int argc, char *argv[] )
}
//sal_uInt32 startfull = Export::startMessure();
-bool hasInputList = sInputFile.GetBuffer()[0]=='@';
-//printf(x = %s , y = %s , o = %s\n, sOutputFileX.GetBuffer(),
sOutputFileY.GetBuffer() , sOutputFile.GetBuffer() );
+bool hasInputList = sInputFile[0]=='@';
bool hasNoError = true;
-if ( sOutputFile.Len() ){ //
Merge single file ?
-//printf(DBG: Inputfile = %s\n,sInputFile.GetBuffer());
+if ( sOutputFile.getLength() ){
// Merge single file ?
HelpParser aParser( sInputFile, bUTF8 , false );
if ( bMergeMode )
{
//sal_uInt64 startreadloc = Export::startMessure();
MergeDataFile aMergeDataFile(sSDFFile, sInputFile, sal_False);
-//Export::stopMessure( ByteString(read localize.sdf) ,
startreadloc );
hasNoError = aParser.Merge( sSDFFile, sOutputFile ,
[Libreoffice-commits] .: 4 commits - oox/inc oox/source starmath/source
oox/inc/oox/mathml/importutils.hxx | 19 +++
oox/source/mathml/importutils.cxx | 12 ++--
starmath/source/ooxmlexport.cxx| 32 +++-
starmath/source/ooxmlexport.hxx|2 +-
starmath/source/ooxmlimport.cxx| 29 ++---
starmath/source/ooxmlimport.hxx|2 +-
6 files changed, 60 insertions(+), 36 deletions(-)
New commits:
commit 577bb0dc298cc376d94ecdd35672081628bb8a93
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 10:46:43 2011 +0100
if a bracket pair has no left/right bracket, it needs to explicit
(fdo#32636)
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 60fb230..1cdee7f 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -346,6 +346,10 @@ OUString SmOoxmlImport::handleD()
closing = STR( right ) + closing;
if( separator == STR( | )) // plain | would be actually V (logical
or)
separator = STR( mline );
+if( opening.isEmpty())
+opening = STR( left none );
+if( closing.isEmpty())
+closing = STR( right none );
OUStringBuffer ret;
ret.append( opening );
bool first = true;
commit d607e5cda6d2d18464ecdf6740a90870039a78f7
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 10:44:01 2011 +0100
import m:eqArr (part of fdo#32636)
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 8a763a2..60fb230 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -116,6 +116,9 @@ OUString SmOoxmlImport::readOMathArg()
case OPENING( M_TOKEN( d )):
ret += handleD();
break;
+case OPENING( M_TOKEN( eqArr )):
+ret += handleEqArr();
+break;
case OPENING( M_TOKEN( f )):
ret += handleF();
break;
@@ -358,6 +361,22 @@ OUString SmOoxmlImport::handleD()
return ret.makeStringAndClear();
}
+OUString SmOoxmlImport::handleEqArr()
+{
+stream.ensureOpeningTag( M_TOKEN( eqArr ));
+OUString ret;
+do
+{ // there must be at least one m:e
+if( !ret.isEmpty())
+ret += STR( # );
+ret += STR( );
+ret += readOMathArgInElement( M_TOKEN( e ));
+ret += STR( );
+} while( !stream.atEnd() stream.findTag( OPENING( M_TOKEN( e ;
+stream.ensureClosingTag( M_TOKEN( eqArr ));
+return STR( stack { ) + ret + STR( } );
+}
+
OUString SmOoxmlImport::handleF()
{
stream.ensureOpeningTag( M_TOKEN( f ));
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index 5bea975..dc6816f 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -49,7 +49,7 @@ private:
rtl::OUString handleBox();
rtl::OUString handleBorderBox();
rtl::OUString handleD();
-rtl::OUString handleE();
+rtl::OUString handleEqArr();
rtl::OUString handleF();
rtl::OUString handleFunc();
enum LimLowUpp_t { LimLow, LimUpp };
commit a69d808021e25303c62b84df459515d1ca52dc12
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 10:43:17 2011 +0100
export vertical stack as m:eqArr, seems to fit much better
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 3604894..a7740da 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -152,7 +152,7 @@ void SmOoxmlExport::HandleTable( const SmNode* pNode, int
nLevel )
//OOXML output stack which would grow
//without bound in a multi step conversion
if( nLevel || pNode-GetNumSubNodes() 1 )
-HandleVerticalStack( pNode, nLevel, 0 );
+HandleVerticalStack( pNode, nLevel );
else
HandleAllSubNodes( pNode, nLevel );
}
@@ -174,29 +174,19 @@ void SmOoxmlExport::HandleAllSubNodes( const SmNode*
pNode, int nLevel )
}
}
-// output vertical stack, firstItem says which child to use as first (if there
-// are more than two children, OOXML can have only a vertical stack of two
items,
-// so create a bigger vertical stack recursively)
-void SmOoxmlExport::HandleVerticalStack( const SmNode* pNode, int nLevel, int
firstItem )
+void SmOoxmlExport::HandleVerticalStack( const SmNode* pNode, int nLevel )
{
-if( firstItem == pNode-GetNumSubNodes() - 1 ) // only one item, just
output the item
+m_pSerializer-startElementNS( XML_m, XML_eqArr, FSEND );
+int size = pNode-GetNumSubNodes();
+for( int i = 0;
+ i size;
+ ++i )
{
-HandleNode( pNode-GetSubNode( firstItem ), nLevel + 1 );
-return;
+m_pSerializer-startElementNS( XML_m, XML_e, FSEND );
+HandleNode( pNode-GetSubNode( i ), nLevel + 1 );
+m_pSerializer-endElementNS( XML_m, XML_e );
}
-m_pSerializer-startElementNS( XML_m, XML_f, FSEND );
-m_pSerializer-startElementNS( XML_m,
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - oox/inc oox/source starmath/source
oox/inc/oox/mathml/importutils.hxx | 19 +++
oox/source/mathml/importutils.cxx | 12 ++--
starmath/source/ooxmlexport.cxx| 32 +++-
starmath/source/ooxmlexport.hxx|2 +-
starmath/source/ooxmlimport.cxx| 29 ++---
starmath/source/ooxmlimport.hxx|2 +-
6 files changed, 60 insertions(+), 36 deletions(-)
New commits:
commit 40f129a99e691babaf7320cb32dff7ec5c77275c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 10:46:43 2011 +0100
if a bracket pair has no left/right bracket, it needs to explicit
(fdo#32636)
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 60fb230..1cdee7f 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -346,6 +346,10 @@ OUString SmOoxmlImport::handleD()
closing = STR( right ) + closing;
if( separator == STR( | )) // plain | would be actually V (logical
or)
separator = STR( mline );
+if( opening.isEmpty())
+opening = STR( left none );
+if( closing.isEmpty())
+closing = STR( right none );
OUStringBuffer ret;
ret.append( opening );
bool first = true;
commit 0e0988cc08269eb125bf6e362b8ddba0c0771296
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 10:44:01 2011 +0100
import m:eqArr (part of fdo#32636)
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 8a763a2..60fb230 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -116,6 +116,9 @@ OUString SmOoxmlImport::readOMathArg()
case OPENING( M_TOKEN( d )):
ret += handleD();
break;
+case OPENING( M_TOKEN( eqArr )):
+ret += handleEqArr();
+break;
case OPENING( M_TOKEN( f )):
ret += handleF();
break;
@@ -358,6 +361,22 @@ OUString SmOoxmlImport::handleD()
return ret.makeStringAndClear();
}
+OUString SmOoxmlImport::handleEqArr()
+{
+stream.ensureOpeningTag( M_TOKEN( eqArr ));
+OUString ret;
+do
+{ // there must be at least one m:e
+if( !ret.isEmpty())
+ret += STR( # );
+ret += STR( );
+ret += readOMathArgInElement( M_TOKEN( e ));
+ret += STR( );
+} while( !stream.atEnd() stream.findTag( OPENING( M_TOKEN( e ;
+stream.ensureClosingTag( M_TOKEN( eqArr ));
+return STR( stack { ) + ret + STR( } );
+}
+
OUString SmOoxmlImport::handleF()
{
stream.ensureOpeningTag( M_TOKEN( f ));
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index 5bea975..dc6816f 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -49,7 +49,7 @@ private:
rtl::OUString handleBox();
rtl::OUString handleBorderBox();
rtl::OUString handleD();
-rtl::OUString handleE();
+rtl::OUString handleEqArr();
rtl::OUString handleF();
rtl::OUString handleFunc();
enum LimLowUpp_t { LimLow, LimUpp };
commit a77bbdb6f4203be700bacacd186757b058941346
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 10:43:17 2011 +0100
export vertical stack as m:eqArr, seems to fit much better
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 3604894..a7740da 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -152,7 +152,7 @@ void SmOoxmlExport::HandleTable( const SmNode* pNode, int
nLevel )
//OOXML output stack which would grow
//without bound in a multi step conversion
if( nLevel || pNode-GetNumSubNodes() 1 )
-HandleVerticalStack( pNode, nLevel, 0 );
+HandleVerticalStack( pNode, nLevel );
else
HandleAllSubNodes( pNode, nLevel );
}
@@ -174,29 +174,19 @@ void SmOoxmlExport::HandleAllSubNodes( const SmNode*
pNode, int nLevel )
}
}
-// output vertical stack, firstItem says which child to use as first (if there
-// are more than two children, OOXML can have only a vertical stack of two
items,
-// so create a bigger vertical stack recursively)
-void SmOoxmlExport::HandleVerticalStack( const SmNode* pNode, int nLevel, int
firstItem )
+void SmOoxmlExport::HandleVerticalStack( const SmNode* pNode, int nLevel )
{
-if( firstItem == pNode-GetNumSubNodes() - 1 ) // only one item, just
output the item
+m_pSerializer-startElementNS( XML_m, XML_eqArr, FSEND );
+int size = pNode-GetNumSubNodes();
+for( int i = 0;
+ i size;
+ ++i )
{
-HandleNode( pNode-GetSubNode( firstItem ), nLevel + 1 );
-return;
+m_pSerializer-startElementNS( XML_m, XML_e, FSEND );
+HandleNode( pNode-GetSubNode( i ), nLevel + 1 );
+m_pSerializer-endElementNS( XML_m, XML_e );
}
-m_pSerializer-startElementNS( XML_m, XML_f, FSEND );
-m_pSerializer-startElementNS( XML_m,
[Libreoffice-commits] .: framework/source
framework/source/loadenv/loadenv.cxx | 36 +--
1 file changed, 22 insertions(+), 14 deletions(-)
New commits:
commit 80cc772841dc3b03f0a629215858d0a44f5419a1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 10:00:36 2011 +
pretty up exception message for display in StarBasic dialogs
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index ef65152..090b6aa 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -193,24 +193,32 @@ css::uno::Reference css::lang::XComponent
LoadEnv::loadComponentFromURL(const
switch(ex.m_nID)
{
case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
-throw css::lang::IllegalArgumentException(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Optional list of arguments seem to
be corrupted.)),
-xLoader,
-4);
+throw css::lang::IllegalArgumentException(
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Optional list
of arguments seem to be corrupted.)),
+xLoader,
+4);
case LoadEnvException::ID_UNSUPPORTED_CONTENT:
-throw css::lang::IllegalArgumentException(
-(rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Unsupported URL )) +
- sURL +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(: \)) +
- rtl::OStringToOUString(
- ex.m_sMessage, RTL_TEXTENCODING_UTF8) +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\))),
+{
+rtl::OUStringBuffer aMsg;
+aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(Unsupported URL
)).
+append(sURL).append('');
+
+if (!ex.m_sMessage.isEmpty())
+{
+aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(: \)).
+append(rtl::OStringToOUString(
+ ex.m_sMessage, RTL_TEXTENCODING_UTF8)).
+appendAscii(RTL_CONSTASCII_STRINGPARAM(\));
+}
+
+throw
css::lang::IllegalArgumentException(aMsg.makeStringAndClear(),
xLoader, 1);
+}
-default: xComponent.clear();
-break;
+default:
+xComponent.clear();
+break;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source unotools/source unusedcode.easy
cui/source/inc/treeopt.hxx |2
cui/source/options/treeopt.cxx | 18 ++--
unotools/source/config/securityoptions.cxx |6 -
unusedcode.easy| 127 +++--
4 files changed, 42 insertions(+), 111 deletions(-)
New commits:
commit 217cde3790a05c786b7809d6326a15542aadd4ac
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 13:15:45 2011 +
callcatcher: update list
diff --git a/unotools/source/config/securityoptions.cxx
b/unotools/source/config/securityoptions.cxx
index 89b63cb..cb925a2 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -198,7 +198,6 @@ class SvtSecurityOptions_Impl : public ConfigItem
Sequence SvtSecurityOptions::Certificate GetTrustedAuthors (
) const ;
voidSetTrustedAuthors (
const Sequence SvtSecurityOptions::Certificate rAuthors
) ;
-sal_BoolIsTrustedAuthorsEnabled (
) ;
sal_BoolIsOptionSet ( SvtSecurityOptions::EOption
eOption ) const ;
sal_BoolSetOption ( SvtSecurityOptions::EOption
eOption, sal_Bool bValue ) ;
@@ -968,11 +967,6 @@ void SvtSecurityOptions_Impl::SetTrustedAuthors( const
Sequence SvtSecurityOpti
}
}
-sal_Bool SvtSecurityOptions_Impl::IsTrustedAuthorsEnabled()
-{
-return m_bROTrustedAuthors;
-}
-
sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption
eOption ) const
{
sal_Bool* pValue;
diff --git a/unusedcode.easy b/unusedcode.easy
index 5c73cc0..bf0dd0f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,6 @@
+(anonymous namespace)::Test::testCopyPaste()
(anonymous
namespace)::getState(std::__debug::vectorcppcanvas::internal::OutDevState,
std::allocatorcppcanvas::internal::OutDevState const)
+Animation::IsEmpty() const
AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar,
std::char_traitschar, std::allocatorchar )
AtomFolder::AtomFolder(AtomPubSession*, std::basic_stringchar,
std::char_traitschar, std::allocatorchar )
AtomPubSession::getCollectionUrl(Collection::Type)
@@ -7,7 +9,6 @@ BitmapWriteAccess::DrawPolygon(Polygon const)
BufferNode::childAt(int) const
ByteString::Assign(char const*, unsigned short)
ByteString::Assign(char)
-ByteString::ByteString(String const, unsigned short, unsigned int)
CIccCLUT::Interp3dTetra(float*, float const*)
CIccCLUT::Iterate(IIccCLUTExec*)
CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
@@ -66,13 +67,6 @@ CurrencyBox::GetValuePos(long) const
CurrencyField::CurrencyField(Window*, ResId const)
CurrencyFormatter::SetCurrencySymbol(String const)
CustomToolBarImportHelper::showToolbar(rtl::OUString const)
-DateBox::DateBox(Window*, ResId const)
-DateBox::GetDate(unsigned short) const
-DateBox::GetDatePos(Date const) const
-DateBox::InsertDate(Date const, unsigned short)
-DateBox::RemoveDate(Date const)
-DateFormatter::GetRealDate() const
-DateFormatter::IsDateModified() const
DateTime::MakeDateTimeFromSec(Date const, unsigned long)
DdeGetPutItem::DdeGetPutItem(DdeItem const)
DdeService::AddFormat(unsigned long)
@@ -306,6 +300,9 @@ ScCellObj::SetFormulaResultDouble(double)
ScCellObj::SetFormulaResultString(rtl::OUString const)
ScCellObj::SetFormulaWithGrammar(rtl::OUString const, rtl::OUString const,
formula::FormulaGrammar::Grammar)
ScChangeActionContent::SetNewValue(String const, ScDocument*)
+ScClipRangeNameData::ScClipRangeNameData()
+ScClipRangeNameData::insert(unsigned short, unsigned short)
+ScClipRangeNameData::~ScClipRangeNameData()
ScCompressedArrayint, unsigned char::GetEntryCount() const
ScCompressedArrayint, unsigned short::CopyFrom(ScCompressedArrayint,
unsigned short const, int, int, long)
ScCompressedArrayint, unsigned short::GetValue(int) const
@@ -376,13 +373,7 @@
ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const) const
ScStringCell::ScStringCell()
ScSubTotalDescriptorBase::GetData(ScSubTotalParam) const
ScSubTotalDescriptorBase::PutData(ScSubTotalParam const)
-ScTabPageSortFields::GetRanges()
-ScTabPageSortOptions::GetRanges()
ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*)
-ScTpCalcOptions::GetRanges()
-ScTpPrintOptions::GetRanges()
-ScTpSubTotalGroup::GetRanges()
-ScTpUserLists::GetRanges()
ScUserList::end()
ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const, unsigned short)
@@ -598,20 +589,16 @@ SvpSalInstance::CancelEvent(SalFrame const*, void*,
unsigned short)
SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const)
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc
sc/inc/token.hxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 5077756d82878e6eb3ea5662e37b8470ae14f35c
Author: Eike Rathke er...@redhat.com
Date: Tue Dec 20 15:59:34 2011 +0100
another ScToken::GetDoubleRef: virtual dummy called
When checking for svSingleRef or svDoubleRef, also check for
svExternalSingleRef or svExternalDoubleRef. Otherwise the dummy reference is
treated.
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 90c9dfb..fc65823 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -455,7 +455,8 @@ class SingleDoubleRefModifier
public:
SingleDoubleRefModifier( ScToken rT )
{
-if ( rT.GetType() == formula::svSingleRef )
+formula::StackVar eType = rT.GetType();
+if ( eType == formula::svSingleRef || eType ==
formula::svExternalSingleRef )
{
pS = rT.GetSingleRef();
aDub.Ref1 = aDub.Ref2 = *pS;
@@ -490,8 +491,9 @@ public:
SingleDoubleRefProvider( const ScToken r )
: Ref1( r.GetSingleRef() ),
-Ref2( r.GetType() == formula::svDoubleRef ?
-r.GetDoubleRef().Ref2 : Ref1 )
+Ref2( (r.GetType() == formula::svDoubleRef ||
+r.GetType() ==
formula::svExternalDoubleRef) ?
+r.GetDoubleRef().Ref2 : Ref1 )
{}
SingleDoubleRefProvider( const ScSingleRefData r )
: Ref1( r ), Ref2( r )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/ooxmlimport.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 170d75c3f58e500bda864bf7b7aeefd06716a0a6
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 20 15:33:40 2011 +0100
remove obsolete comment
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 1cdee7f..2fa59e1 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -408,8 +408,7 @@ OUString SmOoxmlImport::handleF()
else if( operation == lin )
return STR( { ) + num + STR( } / { ) + den + STR( } );
else // noBar
-{ // TODO we write out stack of 3 items as recursive m:f, so merge here
back
- // to 'stack { x # y # z }'
+{
return STR( binom { ) + num + STR( } { ) + den + STR( } );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/customize/acccfg.cxx |8
cui/source/customize/cfg.cxx | 26 +-
cui/source/customize/cfgutil.cxx | 10 +-
cui/source/customize/macropg.cxx |6 +++---
cui/source/customize/selector.cxx | 10 +-
cui/source/dialogs/SpellDialog.cxx| 14 +++---
cui/source/dialogs/about.cxx |4 ++--
cui/source/dialogs/colorpicker.cxx|2 +-
cui/source/dialogs/hangulhanjadlg.cxx |2 +-
cui/source/dialogs/hldocntp.cxx |4 ++--
cui/source/dialogs/hlinettp.cxx |2 +-
cui/source/dialogs/hlmarkwn.cxx |6 +++---
cui/source/dialogs/insdlg.cxx |2 +-
cui/source/dialogs/scriptdlg.cxx | 28 ++--
cui/source/dialogs/thesdlg.cxx|8
cui/source/inc/acccfg.hxx |2 +-
cui/source/options/dbregister.cxx |2 +-
cui/source/options/optcolor.cxx |2 +-
cui/source/options/optgdlg.cxx| 10 +-
cui/source/options/optlingu.cxx | 24
cui/source/options/optsave.cxx| 18 +-
cui/source/options/treeopt.cxx| 22 +++---
cui/source/tabpages/autocdlg.cxx |2 +-
cui/source/tabpages/numpages.cxx |8
cui/source/tabpages/tpbitmap.cxx |2 +-
cui/source/tabpages/tpcolor.cxx |2 +-
cui/source/tabpages/tpgradnt.cxx |2 +-
cui/source/tabpages/tphatch.cxx |2 +-
cui/source/tabpages/tplnedef.cxx |2 +-
cui/source/tabpages/tplneend.cxx |2 +-
30 files changed, 117 insertions(+), 117 deletions(-)
New commits:
commit 1375183d465fb17db513dfe16ac522e48573a4c0
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Dec 16 17:29:07 2011 -0200
Fix for fdo43460 Part XI getLength() to isEmpty()
Part XI
Module
cui
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 159272f..9a2a918 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1015,7 +1015,7 @@ void SfxAcceleratorConfigPage::Apply(const
css::uno::Reference css::ui::XAccele
try
{
-if (sCommand.getLength())
+if (!sCommand.isEmpty())
xAccMgr-setKeyEvent(aAWTKey, sCommand);
else
xAccMgr-removeKeyEvent(aAWTKey);
@@ -1233,7 +1233,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl,
sfx2::FileDialogHelper*, EMPTYARG
if ( ERRCODE_NONE == m_pFileDlg-GetError() )
sCfgName = m_pFileDlg-GetPath();
-if ( !sCfgName.getLength() )
+if ( sCfgName.isEmpty() )
return 0;
GetTabDialog()-EnterWait();
@@ -1317,7 +1317,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl,
sfx2::FileDialogHelper*, EMPTYARG
if ( ERRCODE_NONE == m_pFileDlg-GetError() )
sCfgName = m_pFileDlg-GetPath();
-if ( !sCfgName.getLength() )
+if ( sCfgName.isEmpty() )
return 0;
GetTabDialog()-EnterWait();
@@ -1358,7 +1358,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl,
sfx2::FileDialogHelper*, EMPTYARG
// set the correct media type if the storage was new created
::rtl::OUString sMediaType;
xUIConfigProps-getPropertyValue(MEDIATYPE_PROPNAME) =
sMediaType;
-if (!sMediaType.getLength())
+if (sMediaType.isEmpty())
xUIConfigProps-setPropertyValue(MEDIATYPE_PROPNAME,
css::uno::makeAny(MEDIATYPE_UICONFIG));
xCfgMgr = css::uno::Reference css::ui::XUIConfigurationManager
(m_xSMGR-createInstance(SERVICE_UICONFIGMGR), css::uno::UNO_QUERY_THROW);
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index de19df3..35de842 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -481,7 +481,7 @@ OUString GetUIModuleName( const OUString aModuleId, const
uno::Reference css::
}
}
-if ( aModuleUIName.getLength() == 0 )
+if ( aModuleUIName.isEmpty() )
aModuleUIName = GetModuleName( aModuleId );
return aModuleUIName;
@@ -613,7 +613,7 @@ ConvertSvxConfigEntry(
// as an empty string.
// It will be initialised again later using the command to label map.
aPropSeq[2].Name = aDescriptorLabel;
-if ( pEntry-HasChangedName() == sal_False
pEntry-GetCommand().getLength() )
+if ( pEntry-HasChangedName() == sal_False
!pEntry-GetCommand().isEmpty() )
{
sal_Bool isDefaultName = sal_False;
try
@@ -694,7 +694,7 @@ ConvertToolbarEntry(
// as an empty string.
// It will be initialised again later using the command to label map.
aPropSeq[2].Name = aDescriptorLabel;
-if ( pEntry-HasChangedName() == sal_False
pEntry-GetCommand().getLength() )
+if ( pEntry-HasChangedName() == sal_False
!pEntry-GetCommand().isEmpty() )
{
sal_Bool isDefaultName =
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +- solenv/gbuild/platform/com_GCC_class.mk |2 +- solenv/gbuild/platform/solaris.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 0e44efd3744d6355e31f623a21c22057f5b2628c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 20 16:35:18 2011 +0100 missed this in b55dbc1e - show extension for .c files as well diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 3aaf695..3809f3b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -281,7 +281,7 @@ endef # CObject class define gb_CObject__command -$(call gb_Output_announce,$(2),$(true),C ,3) +$(call gb_Output_announce,$(2).c,$(true),C ,3) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(4)) \ $(gb_CC) \ diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 5bf7740..da90948 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -25,7 +25,7 @@ # $(call gb_CObject__command,object,relative-source,source,dep-file) define gb_CObject__command -$(call gb_Output_announce,$(2),$(true),C ,3) +$(call gb_Output_announce,$(2).c,$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) \ $(gb_CC) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index a3d055b..afb9629 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -160,7 +160,7 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib # CObject class define gb_CObject__command -$(call gb_Output_announce,$(2),$(true),C ,3) +$(call gb_Output_announce,$(2).c,$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ rm -f $(4) \ mkdir -p $(dir $(1)) $(dir $(4)) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/pixman-0.24.0.patch configure.in icu/createmak.pl python/Python-2.6.1.patch RepositoryFixes.mk solenv/gbuild solenv/inc soltools/mkdepend
RepositoryFixes.mk |4
cairo/pixman-0.24.0.patch |2 +-
configure.in|9 -
icu/createmak.pl| 12
python/Python-2.6.1.patch |2 +-
solenv/gbuild/gbuild.mk |4
solenv/gbuild/gbuild_simple.mk |2 --
solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 +--
solenv/inc/settings.mk |1 -
soltools/mkdepend/makefile.mk |5 -
10 files changed, 7 insertions(+), 37 deletions(-)
New commits:
commit 7d3c674a0444e7688178b00ae4675bb65c685798
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Dec 20 18:06:46 2011 +0200
Abandon attempt to use the debug CRT in a dbgutil build
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 901f7b8..ff1eb34 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -125,10 +125,6 @@ gb_Library_NOILIBFILENAMES += \
gb_Library_FILENAMES := $(filter-out $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
-ifneq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst
msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
-endif
-
endif # ifeq ($(COM),GCC)
endif # ifeq ($(OS),WNT)
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
index a6141ac..39122cd 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.0.patch
@@ -19,7 +19,7 @@
+endif
+
+ifeq ($(CFG_VAR),debug)
-+CFG_CFLAGS = -MDd -Od -Zi
++CFG_CFLAGS = -MD -Od -Zi
+CFG_LDFLAGS = -DEBUG
+else
+CFG_CFLAGS = -MD -O2
diff --git a/configure.in b/configure.in
index 120ed1f..c60a4ec 100644
--- a/configure.in
+++ b/configure.in
@@ -2434,15 +2434,6 @@ if test -n $enable_dbgutil test $enable_dbgutil
!= no; then
PROEXT=
PRODUCT=
-# Compiling with MSVC using --enable-dbgutil (i.e. using the
-# debugging runtime, and defining _DEBUG when compiling) just
-# causes too many compilation errors. After having spent some
-# months slowly fixing them one by one, having reached sw, I give
-# up. Feel free to try again.
-if test $_os = WINNT -a $WITH_MINGW != yes; then
-AC_MSG_ERROR([Sorry, --enable-dbgutil won't work with MSVC])
-fi
-
AC_MSG_RESULT([yes])
# cppunit and graphite expose STL in public headers
if test $with_system_cppunit = yes; then
diff --git a/icu/createmak.pl b/icu/createmak.pl
index 891c5e3..3786ec1 100644
--- a/icu/createmak.pl
+++ b/icu/createmak.pl
@@ -364,12 +364,6 @@ sub createMakDepSection #01.04.2008 13:36
{
$line =~ s/CPP_PROJ=/CPPX_PROJ=/;
$line =~ s/-Za/-Ze/;
-if ( $nonpro )
-{
-# if non product link against debug libraries
-$line =~ s/-MD/-MDd/;
-$line =~ s/-MT/-MTd/;
-}
push @{$ref_make_file}, $line;
}
}
@@ -703,12 +697,6 @@ sub print_flags #18.04.2008 14:19
@template = @{$template_hash{$switch}};
foreach $line(@template)
{
-if ( $nonpro )
-{
-# if non product link against debug libraries
-$line =~ s/-MD/-MDd/;
-$line =~ s/-MT/-MTd/;
-}
print MAKFILE $line;
}
}
diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch
index ac70bab..fe04ae3 100644
--- a/python/Python-2.6.1.patch
+++ b/python/Python-2.6.1.patch
@@ -434,7 +434,7 @@
}
else if (strcmp(argv[1], Debug) == 0) {
- strcat_s(command, CMD_SIZE, -D_DEBUG -MDd );
-+ strcat_s(command, CMD_SIZE, -D_DEBUG -MD );
++ strcat_s(command, CMD_SIZE, -MD );
}
else if (strcmp(argv[1], ReleaseItanium) == 0) {
strcat_s(command, CMD_SIZE, -MD /USECL:MS_ITANIUM );
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 521a9c9..a75fda2 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -194,9 +194,13 @@ gb_GLOBALDEFS += \
else
gb_GLOBALDEFS += \
-DDBG_UTIL \
+
+ifneq ($(COM),MSC)
+gb_GLOBALDEFS += \
-D_DEBUG \
endif
+endif
ifneq ($(strip $(SOLAR_JAVA)),)
gb_GLOBALDEFS += -DSOLAR_JAVA
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index aeac005..a4cdb0d 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -46,8 +46,6 @@ include $(GBUILDDIR)/BuildDirs.mk
# I think any use of gbuild_simple.mk is in a sub-make under one that
# uses gbuild.mk anyway.
-# gb_PRODUCT is used by windows.mk to decide which C/C++ runtime to
-# link with.
ifneq ($(strip $(PRODUCT)$(product)),)
gb_PRODUCT := $(true)
else
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.2'
Tag 'libreoffice-3.4.99.2' created by Petr Mladek pmla...@suse.cz at
2011-12-20 16:06 +0100
Tag $lo_version_tag (${vendor_use:+$vendor LO }$lo_version_app-$lo_release_id)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)
iQIcBAABAgAGBQJO8LKCAAoJEPQ0oe+v7q6j8cgP/3izwBYVuhAWmFoeXTJT5hmx
SL9Rb7r7Kn8ek/iVzIgKRuaG5ax2Aks1LrjTJ5ycef9+nIJ7G4Pb1j6S/MGEdbIU
RJcVe2q87dAVuaF6iVhIQtrwipZvCBKnTrCs+ZD3NI/4jboBjpZNuIcas9czuJXA
OGr3Y3zQOSM51G8yzoarxa/OCcyj4gwFv0AsGsNF9lcEOF9aMqfwYe04h2FwqHmV
u3yri602xU0S7uUBgR38gfPrUuSp7QM6egFCRKYaneZCW5+5GIqNpg4sk5i3p8KJ
Km3Nyijh08frIKXOsdCjMmzmR891SMDh8+mkG5/iQnYH3w3T+MO30r/e7i5mffhE
p4PkmRiIilJeR2kq9PxBvk61fEJRJK7e3gCm0D5jpUBH+pO5jXWbHhOqG/OJO18E
VYJ3HIpRzdFKanNXWfb8lyqCLJe5srG/BeCn63/XMislCBwmGm+5X1g5/9XkXJM0
AWdcAOIpjklTFypGDTd/a+Go+TRCgh/0zfYL43VztTiISwcVKdNTBpQzzXzMBYr3
DxTtYM3N/SDYnIZtF/X8KYYEJ5DnUodLu43J4wW+yxRZMiTPCDeGXfRaVDBOgORs
PXga/ibvi9kq8mPtffoEjcg8N71pOWbEyIFpnLdJY3Xq8eeQSpdc+B+gJcwMfLal
4AGBVW/jleTCf10E2OUy
=QNxe
-END PGP SIGNATURE-
Changes since libreoffice-3-5-branch-point-1:
---
0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.2'
Tag 'libreoffice-3.4.99.2' created by Petr Mladek pmla...@suse.cz at
2011-12-20 16:06 +0100
Tag $lo_version_tag (${vendor_use:+$vendor LO }$lo_version_app-$lo_release_id)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)
iQIcBAABAgAGBQJO8LKDAAoJEPQ0oe+v7q6ju7oQAM5cwIPkRW6wUhfqIa8XEfbG
5OtIl+67QCE0Qkn6tmAqw0DR/42MhbyE2OMYCV9lGbfy6oXlWjoHo8wL0OD+1oiB
QGpLgGahWSt/9GBZpOYwIHT+s7QB7GLSRsztB/Dt5T9fMzFi/vAyx0DttK0Px99w
+biHzAJF5Sfs2qdeEBRU/gD95+zP3tQASIGZfwIwhRhqCYr0G4UhnLLJdJoOQuyZ
k7eTUVu/YHg1JPzLWLNpjmjYOyO5Nzx0VJQYdKfx+szjq+LBaRkHcYkRmvXRfK9/
7ZqfdJu8rXm1bSDgVgKW8aw/KIumMpqSNvAGEv/hS+wHSpPh6qvTgdMroAk+BTzU
Ix9y9tfqTqhes3m5hNtdUXxgYBZ4oNaBn3A//smrAf1cIjpuKY1qXUORuqS+3YMz
M+FOZR8l30IWlATEMSRi/VTGw1ACXNxGCXFl5CRA1qxYCo94yk2gg3scYbaWbtrf
w9qIyfGXXu1ftDxoNWBzomjdLvzGLvFYw4e7mStytcA0tbTFujvfKMQSXD4AEk97
3RDM0r6sGwb62bL4Db/ShSN/RC/igJ0JDq4wt/WKkN9aXCsFqRphTCice1qveo9w
A1j/kF8PUWXPoBu8d/NSYUpVlz7+tFO0wd9Cr2pLBLbk/VnMo0r7/5rMmjcXp1Dj
gS6Xhoo9VglPK43bcQs8
=uldc
-END PGP SIGNATURE-
Changes since libreoffice-3-5-branch-point-13:
---
0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 4862b48b4d4eda39e24b18368f405e18ffaf1298 Author: Peter Foley pefol...@verizon.net Date: Tue Dec 20 12:15:32 2011 -0500 ignore concat-deps on cygwin diff --git a/.gitignore b/.gitignore index e9864e2..705ddbd 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ TAGS # botstrap generated tool /solenv/bin/concat-deps +/solenv/bin/concat-deps.exe # test output files test/user-template/user/psprint/pspfontcache ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unoxml/qa
unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 44 ++--
1 file changed, 33 insertions(+), 11 deletions(-)
New commits:
commit cb1ad8c8df48161917fdb2044ac55d144049d2f4
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 20 18:28:58 2011 +0100
unordf: tweak SPARQL unit test:
rasqal 0.9.27 returns no variables for a SPARQL SELECT query with no
results; it is unclear whether that is allowed but it is a corner case
and probably we should not be testing for that.
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index 7944a0e..d1006c2 100644
--- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -785,15 +785,30 @@ public class RDFRepositoryTest
String[] vars = (String[]) i_Result.getBindingNames();
XEnumeration iter = (XEnumeration) i_Result;
XNode[][] bindings = toSeqs(iter);
-if (vars.length != i_Vars.length) {
-System.out.println(var lengths differ);
-return false;
-}
if (bindings.length != i_Bindings.length) {
System.out.println(binding lengths differ: + i_Bindings.length +
vs + bindings.length );
return false;
}
+if (vars.length != i_Vars.length) {
+// ignore for empty result: it is unclear to me whether SPARQL
+// spec requires returning the variables in this case,
+// and evidently newer rasqal versions don't
+if (0 != i_Bindings.length || 0 != vars.length)
+{
+System.out.println(var lengths differ: expected
++ i_Vars.length + but got + vars.length);
+return false;
+}
+} else {
+for (int i = 0; i i_Vars.length; ++i) {
+if (!vars[i].equals(i_Vars[i])) {
+System.out.println(variable names differ: +
+vars[i] + != + i_Vars[i]);
+return false;
+}
+}
+}
java.util.Arrays.sort(bindings, new BindingComp());
java.util.Arrays.sort(i_Bindings, new BindingComp());
for (int i = 0; i i_Bindings.length; ++i) {
@@ -813,13 +828,6 @@ public class RDFRepositoryTest
}
}
}
-for (int i = 0; i i_Vars.length; ++i) {
-if (!vars[i].equals(i_Vars[i])) {
-System.out.println(variable names differ: +
-vars[i] + != + i_Vars[i]);
-return false;
-}
-}
return true;
}
@@ -839,6 +847,20 @@ public class RDFRepositoryTest
return namespaces;
}
+// useful when debugging
+static void dumpRepo(XDocumentRepository xRep) throws Exception
+{
+XEnumeration xEnum = xRep.getStatements(null, null, null);
+while (xEnum.hasMoreElements())
+{
+Statement s = (Statement) xEnum.nextElement();
+System.out.println(STATEMENT IN: + toS(s.Graph)
++ \n S: + toS(s.Subject)
++ \n P: + toS(s.Predicate)
++ \n O: + toS(s.Object));
+}
+}
+
class TestRange implements XTextRange, XMetadatable, XServiceInfo
{
String m_Stream;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com udkapi/com
offapi/com/sun/star/drawing/DrawingDocumentFactory.idl |2 +-
offapi/com/sun/star/i18n/XExtendedTransliteration.idl |2 +-
offapi/com/sun/star/i18n/XNativeNumberSupplier.idl |2 +-
offapi/com/sun/star/linguistic2/LanguageGuessing.idl |2 +-
udkapi/com/sun/star/util/logging/Logger.idl|4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9ae50a6d41c535273ebfab77b9140952d302a177
Author: Michael Meeks michael.me...@suse.com
Date: Tue Dec 20 17:46:59 2011 +
Revert minor idl fixes - no explicit license statement yet.
This reverts commit 5260bf5ea7271cca4767f596592091dcdfd895fe.
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index 71d3231..41bbd29 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -26,7 +26,7 @@
**
**/
#ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
-#define __com_sun_star_drawing_DrawingDocumentFactory_idl__
+#define __com::sun::star::drawing_DrawingDocumentFactory_idl__
#include com/sun/star/lang/XMultiServiceFactory.idl
diff --git a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
index 3afe7c8..ca2348d 100644
--- a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
+++ b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
@@ -29,7 +29,7 @@
#define __com_sun_star_i18n_XExtendedTransliteration_idl__
#include com/sun/star/i18n/XTransliteration.idl
-#include com/sun/star/i18n/MultipleCharsOutputException.idl
+#include MultipleCharsOutputException.idl
//=
diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
index 2e96883..a11ad7a 100644
--- a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
+++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
@@ -29,7 +29,7 @@
#define __com_sun_star_i18n_XNativeNumberSupplier_idl__
#include com/sun/star/lang/Locale.idl
-#include com/sun/star/i18n/NativeNumberXmlAttributes.idl
+#include NativeNumberXmlAttributes.idl
//=
diff --git a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
index 5ba3c04..1e99fbc 100644
--- a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
@@ -28,7 +28,7 @@
#ifndef __com_sun_star_linguistic2_LanguageGuessing_idl__
#define __com_sun_star_linguistic2_LanguageGuessing_idl__
-#include com/sun/star/linguistic2/XLanguageGuessing.idl
+#include XLanguageGuessing.idl
module com { module sun { module star { module linguistic2 {
diff --git a/udkapi/com/sun/star/util/logging/Logger.idl
b/udkapi/com/sun/star/util/logging/Logger.idl
index 72e377a..5f02627 100644
--- a/udkapi/com/sun/star/util/logging/Logger.idl
+++ b/udkapi/com/sun/star/util/logging/Logger.idl
@@ -29,8 +29,8 @@
#define __com_sun_star_webtop_Logger_idl__
#include com/sun/star/uno/XInterface.idl
-#include com/sun/star/util/logging/XLogger.idl
-#include com/sun/star/util/logging/XLoggerRemote.idl
+#include XLogger.idl
+#include XLoggerRemote.idl
//=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc
svx/inc/svx/obj3d.hxx |2 -
svx/inc/svx/sdrpagewindow.hxx |2 -
svx/inc/svx/sdtakitm.hxx | 76 --
svx/inc/svx/sdynitm.hxx |6 +--
svx/inc/svx/sphere3d.hxx | 12 +++---
svx/inc/svx/svdcrtv.hxx | 52 ++--
svx/inc/svx/svddef.hxx|4 +-
svx/inc/svx/svddrag.hxx | 42 +++
svx/inc/svx/svddrgv.hxx | 12 +++---
9 files changed, 103 insertions(+), 105 deletions(-)
New commits:
commit c5ed0b8f95600c3ceacbcd4511dc3a7b4cabcbae
Author: Noel Grandin n...@peralex.com
Date: Tue Dec 20 19:01:27 2011 +0100
svx: translation by Mike Whiteley and Noel Grandin
(with very few tweaks by the committer)
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 5cf5d03..e2d7e2d 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -118,7 +118,7 @@ private:
protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
-E3dObjList maSubList; // child objekts
+E3dObjList maSubList; // child objects
basegfx::B3DRange maLocalBoundVol;// surrounding volume of
the object (from the geometry generation)
basegfx::B3DHomMatrix maTransformation; // local transformation
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index 7498c32..d1a2633 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -35,7 +35,7 @@
#include com/sun/star/awt/XControlContainer.hpp
#include com/sun/star/util/XModeChangeListener.hpp
#include cppuhelper/implbase4.hxx
-#include svx/svdtypes.hxx // fuer SdrLayerID
+#include svx/svdtypes.hxx // for SdrLayerID
#include svl/svarray.hxx
#include tools/contnr.hxx
#include svx/sdrpagewindow.hxx
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index a869003..a2b42df 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -43,48 +43,46 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
SDRTEXTANI_SLIDE};
// - SDRTEXTANI_BLINK:
-// Einfach nur Blinken. Direction und Amount ohne Wirkung.
-// Frequenz siehe Delay, 0=0.5Hz (Delay=250).
-// Count=Anzahl der blinker. 0=Endlos.
-// StartInside: sal_False=beginnend mit Pause, sal_True=Beginnend mit Puls
-// StopInside: sal_False=Nach Count blinkern nicht sichtbar,
sal_True=sichtbar
-//(nur wenn Count!=0)
+// Just blink. Direction and Amount don't effect things.
+// Frequency delay: 0 = 0.5Hz (Delay = 250).
+// Count = number of blinks. (0 = forever)
+// start inside: sal_False = begin with the blinker off, sal_True = begin
with the blinker on
+// stop inside: sal_False = end with the blinker off, sal_True = end with
the blinker on
+//(Only if count! = 0)
// - SDRTEXTANI_SCROLL:
-// Schrift laeuft rein, laeuft vollstaendig durch. Wenn ganz verschwunden
-// geht's wieder von vorne los.
-// Delay in ms, Sonderfall Delay=0 wird auf 50ms defaulted (20Hz)
-// Count=Durchlaufanzahl (0=Endlos)
-// Direction: ist eben die Richtung in die gescrollt wird.
-// StartInside: sal_False=Schrift wird auch beim ersten Durchlauf
reingescrollt
-//sal_True=Der linke Teil der Schrift steht beim ersten
Durchlauf
-// bereits da (im sichtbaren Scrollbereich)
-// StopInside: sal_False=Schrift wird auch beim letzten Durchlauf
vollstaendig
-// rausgescrollt
-//sal_True=Schrift wird beim letzten Durchlauf nicht
rausgescrollt
-//(nur wenn Count!=0)
-// Amount: Schrittweite in logischen Einheiten. Negative Werte bedeuten
-// Pixel statt log. Einheiten. Wenn Amount=0, dann wird auf
-// 1 Pixel defaulted.
+// Text just scrolls all the way through, and starts over when it is done.
+//
+// Delay in ms: (except delay = 0 means 50ms (20Hz) default)
+// Count = number of passes (0 = go forever)
+// Direction: the direction to scroll
+// StartInside: sal_False = on the first pass, scroll the text in (not
initially visible)
+//sal_True = on the first pass, the left part of the text is
already visible
+// in the scroll area before starting.
+// StopInside: sal_False = on the last pass, scroll the text all the way out.
+//sal_True = on the last pass, keep the right part of the text
visible.
+//(Only if count! = 0)
+// Amount: Step size in logical units. Negative values = use Pixels instead
+// of logical units. If Amount = 0, then default to 1 Pixel.
// - SDRTEXTANI_ALTERNATE:
-// Wie SDRTEXTANI_SCROLL, nur wird nicht gescrollt bis Schrift ganz
-// verschwunden, sondern bis der letzte Teil vollstaendig sichtbar ist. Dann
-// wird die Richtung umgekehrt und zuruekgescrollt.
-// Count=Anzahl der Durchlaeufe=Anzahl der
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - solenv/bin sysui/desktop
solenv/bin/ooinstall|9 +
sysui/desktop/debian/makefile.mk| 20 ++--
sysui/desktop/productversion.mk |6 +++---
sysui/desktop/share/makefile.mk |2 +-
sysui/desktop/slackware/makefile.mk | 20 ++--
5 files changed, 33 insertions(+), 24 deletions(-)
New commits:
commit 8fe9441510014a468e9b8d8e901df5f4535ff4ae
Author: Petr Mladek pmla...@suse.cz
Date: Tue Dec 20 19:43:21 2011 +0100
avoid the hardcoded 3.4 version
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 45e0f33..f6ae363 100755
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -45,7 +45,7 @@ TARGET=debian
.IF $(PKGFORMAT)!=$(PKGFORMAT:s/deb//)
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i3.4-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i$(PRODUCTVERSION)-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
.ENDIF
@@ -60,22 +60,22 @@ ALLTAR : $(DEBFILES)
%/DEBIAN/control : $$(@:f)
@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//)) $*$/etc$/
-/bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.4//)
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr
GNOMEDIR=/usr create_tree.sh
-@cat openoffice.org-debian-menus | sed -e
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.4//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.4//))/'
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.4//)
-echo Package: $(*:f:s/_/ /:1:s/3.4//) $@
-cat $(@:f) | tr -d \015 | sed s/%productname/$(PRODUCTNAME.$(*:f:s/-/
/:1:s/3.4//))/ $@
-echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.4//))-$(PKGREV) $@
+ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//)) $*$/etc$/
+/bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//)
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr
GNOMEDIR=/usr create_tree.sh
+@cat openoffice.org-debian-menus | sed -e
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/'
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/$(PRODUCTVERSION)//)
+echo Package: $(*:f:s/_/ /:1:s/$(PRODUCTVERSION)//) $@
+cat $(@:f) | tr -d \015 | sed s/%productname/$(PRODUCTNAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/ $@
+echo Version: $(PKGVERSION.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))-$(PKGREV) $@
@du -k -s $* | awk -F ' ' '{ printf Installed-Size: %s\n, $$1 ; }' $@
%/DEBIAN/postinst : $$(@:f)
- @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g $@
+ @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/g $@
%/DEBIAN/postrm : $$(@:f)
- @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g $@
+ @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/g $@
%/DEBIAN/prerm : $$(@:f)
- @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g $@
+ @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/g $@
# --- packaging ---
diff --git a/sysui/desktop/slackware/makefile.mk
b/sysui/desktop/slackware/makefile.mk
index 4da439e..f75fdf3 100755
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -40,7 +40,7 @@ TARGET=slackware
# --- Files
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.4-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}$(PRODUCTVERSION)-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
# --- Targets ---
@@ -59,26 +59,26 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
# FIXME: removal of *-extension.* only to create identical packages to OOF680
%/usr/share/applications :
@$(MKDIRHIER) $@
-/bin/sh -c cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//); DESTDIR=$(shell @cd
$*; pwd) GNOMEDIR= ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.4//))
KDEMAINDIR=/opt/kde .$/create_tree.sh
+/bin/sh -c cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//);
DESTDIR=$(shell @cd $*; pwd) GNOMEDIR= ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/
/:1:s/$(PRODUCTVERSION)//)) KDEMAINDIR=/opt/kde .$/create_tree.sh
$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png
$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop
$(RM)
[Libreoffice-commits] .: 3 commits - solenv/bin sysui/desktop
solenv/bin/ooinstall|9 +
sysui/desktop/debian/makefile.mk| 20 ++--
sysui/desktop/productversion.mk |6 +++---
sysui/desktop/share/makefile.mk |2 +-
sysui/desktop/slackware/makefile.mk | 20 ++--
5 files changed, 33 insertions(+), 24 deletions(-)
New commits:
commit 6703e91a745c78c2acf1beedfc55f7916d026ef9
Author: Petr Mladek pmla...@suse.cz
Date: Tue Dec 20 19:43:21 2011 +0100
avoid the hardcoded 3.4 version
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 45e0f33..f6ae363 100755
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -45,7 +45,7 @@ TARGET=debian
.IF $(PKGFORMAT)!=$(PKGFORMAT:s/deb//)
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i3.4-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i$(PRODUCTVERSION)-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
.ENDIF
@@ -60,22 +60,22 @@ ALLTAR : $(DEBFILES)
%/DEBIAN/control : $$(@:f)
@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//)) $*$/etc$/
-/bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.4//)
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr
GNOMEDIR=/usr create_tree.sh
-@cat openoffice.org-debian-menus | sed -e
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.4//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.4//))/'
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.4//)
-echo Package: $(*:f:s/_/ /:1:s/3.4//) $@
-cat $(@:f) | tr -d \015 | sed s/%productname/$(PRODUCTNAME.$(*:f:s/-/
/:1:s/3.4//))/ $@
-echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.4//))-$(PKGREV) $@
+ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//)) $*$/etc$/
+/bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//)
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr
GNOMEDIR=/usr create_tree.sh
+@cat openoffice.org-debian-menus | sed -e
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/'
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/$(PRODUCTVERSION)//)
+echo Package: $(*:f:s/_/ /:1:s/$(PRODUCTVERSION)//) $@
+cat $(@:f) | tr -d \015 | sed s/%productname/$(PRODUCTNAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/ $@
+echo Version: $(PKGVERSION.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))-$(PKGREV) $@
@du -k -s $* | awk -F ' ' '{ printf Installed-Size: %s\n, $$1 ; }' $@
%/DEBIAN/postinst : $$(@:f)
- @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g $@
+ @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/g $@
%/DEBIAN/postrm : $$(@:f)
- @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g $@
+ @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/g $@
%/DEBIAN/prerm : $$(@:f)
- @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g $@
+ @cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/$(PRODUCTVERSION)//))/g $@
# --- packaging ---
diff --git a/sysui/desktop/slackware/makefile.mk
b/sysui/desktop/slackware/makefile.mk
index 4da439e..f75fdf3 100755
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -40,7 +40,7 @@ TARGET=slackware
# --- Files
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.4-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}$(PRODUCTVERSION)-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
# --- Targets ---
@@ -59,26 +59,26 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
# FIXME: removal of *-extension.* only to create identical packages to OOF680
%/usr/share/applications :
@$(MKDIRHIER) $@
-/bin/sh -c cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//); DESTDIR=$(shell @cd
$*; pwd) GNOMEDIR= ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.4//))
KDEMAINDIR=/opt/kde .$/create_tree.sh
+/bin/sh -c cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//);
DESTDIR=$(shell @cd $*; pwd) GNOMEDIR= ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/
/:1:s/$(PRODUCTVERSION)//)) KDEMAINDIR=/opt/kde .$/create_tree.sh
$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png
$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop
$(RM)
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/moduldlg.cxx | 41
basctl/source/basicide/moduldlg.hxx |6 ++---
2 files changed, 22 insertions(+), 25 deletions(-)
New commits:
commit b0aac3f446f95080cbcac8e2f011dd56be1bacdd
Author: August Sodora aug...@gmail.com
Date: Tue Dec 20 00:59:11 2011 -0500
String-OUString
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index 954f016..657c3c8 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -732,7 +732,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
return 0;
}
-bool ObjectPage::GetSelection( ScriptDocument rDocument, String rLibName )
+bool ObjectPage::GetSelection( ScriptDocument rDocument, ::rtl::OUString
rLibName )
{
bool bRet = false;
@@ -740,8 +740,8 @@ bool ObjectPage::GetSelection( ScriptDocument rDocument,
String rLibName )
BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
rDocument = aDesc.GetDocument();
rLibName = aDesc.GetLibName();
-if ( !rLibName.Len() )
-rLibName = String::CreateFromAscii( Standard );
+if ( rLibName.isEmpty() )
+rLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Standard));
DBG_ASSERT( rDocument.isAlive(), ObjectPage::GetSelection: no or dead
ScriptDocument in the selection! );
if ( !rDocument.isAlive() )
@@ -784,11 +784,11 @@ bool ObjectPage::GetSelection( ScriptDocument rDocument,
String rLibName )
void ObjectPage::NewModule()
{
ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-String aLibName;
+::rtl::OUString aLibName;
if ( GetSelection( aDocument, aLibName ) )
{
-String aModName;
+::rtl::OUString aModName;
createModImpl( static_castWindow*( this ), aDocument,
aBasicBox, aLibName, aModName, true );
}
@@ -797,7 +797,7 @@ void ObjectPage::NewModule()
void ObjectPage::NewDialog()
{
ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-String aLibName;
+::rtl::OUString aLibName;
if ( GetSelection( aDocument, aLibName ) )
{
@@ -809,14 +809,14 @@ void ObjectPage::NewDialog()
if (xNewDlg-Execute() != 0)
{
-String aDlgName( xNewDlg-GetObjectName() );
-if (aDlgName.Len() == 0)
+::rtl::OUString aDlgName( xNewDlg-GetObjectName() );
+if (aDlgName.isEmpty())
aDlgName = aDocument.createObjectName( E_DIALOGS, aLibName);
if ( aDocument.hasDialog( aLibName, aDlgName ) )
{
ErrorBox( this, WB_OK | WB_DEF_OK,
-String( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) )
).Execute();
+ ResId::toString( IDEResId(
RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute();
}
else
{
@@ -933,7 +933,7 @@ LibDialog::LibDialog( Window* pParent )
aReferenceBox( this, IDEResId( RID_CB_REF ) ),
aReplaceBox(this, IDEResId( RID_CB_REPL ) )
{
-SetText( String( IDEResId( RID_STR_APPENDLIBS ) ) );
+SetText( ResId::toString( IDEResId( RID_STR_APPENDLIBS ) ) );
FreeResource();
}
@@ -942,16 +942,16 @@ LibDialog::~LibDialog()
{
}
-void LibDialog::SetStorageName( const String rName )
+void LibDialog::SetStorageName( const ::rtl::OUString rName )
{
-String aName( IDEResId( RID_STR_FILENAME ) );
+::rtl::OUString aName( ResId::toString( IDEResId( RID_STR_FILENAME ) ) );
aName += rName;
aStorageName.SetText( aName );
}
// Helper function
SbModule* createModImpl( Window* pWin, const ScriptDocument rDocument,
-BasicTreeListBox rBasicBox, const String rLibName, String aModName, bool
bMain )
+BasicTreeListBox rBasicBox, const ::rtl::OUString rLibName,
::rtl::OUString aModName, bool bMain )
{
OSL_ENSURE( rDocument.isAlive(), createModImpl: invalid document! );
if ( !rDocument.isAlive() )
@@ -959,11 +959,11 @@ SbModule* createModImpl( Window* pWin, const
ScriptDocument rDocument,
SbModule* pModule = NULL;
-String aLibName( rLibName );
-if ( !aLibName.Len() )
-aLibName = String::CreateFromAscii( Standard );
+::rtl::OUString aLibName( rLibName );
+if ( aLibName.isEmpty() )
+aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Standard));
rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
-if ( !aModName.Len() )
+if ( aModName.isEmpty() )
aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
boost::scoped_ptr NewObjectDialog xNewDlg(
@@ -1011,7 +1011,7 @@ SbModule* createModImpl( Window* pWin, const
ScriptDocument rDocument,
if( pBasic rDocument.isInVBAMode() )
{
// add the new module in the Modules entry
-SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry(
[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 15 commits - basctl/AllLangResTarget_basctl.mk Module_tail_build.mk postprocess/prj reportdesign/AllLangResTarget_rpt.mk reportdesign/AllL
Module_tail_build.mk | 12 basctl/AllLangResTarget_basctl.mk|2 ++ postprocess/prj/build.lst|2 +- reportdesign/AllLangResTarget_rpt.mk |2 ++ reportdesign/AllLangResTarget_rptui.mk |2 ++ reportdesign/source/ui/dlg/CondFormat.cxx|3 --- reportdesign/source/ui/dlg/DateTime.cxx |2 -- reportdesign/source/ui/dlg/GroupsSorting.cxx |6 +- reportdesign/source/ui/dlg/Navigator.cxx |2 -- reportdesign/source/ui/dlg/PageNumber.cxx|2 -- sc/AllLangResTarget_sc.mk|2 ++ sd/AllLangResTarget_sd.mk|2 ++ starmath/AllLangResTarget_sm.mk |2 ++ svx/AllLangResTarget_svx.mk | 20 sw/AllLangResTarget_sw.mk|2 ++ tail_build/prj/build.lst |2 +- 16 files changed, 41 insertions(+), 24 deletions(-) New commits: commit a029a486868d936d5d4609f6c5b9875406f83536 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Dec 20 20:01:23 2011 +0100 add basic to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index ef026fd..764b9fc 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ animations \ avmedia \ basctl \ +basic \ bean \ canvas \ chart2 \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 5c4e3b8..87ca96d 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx basic bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker framework javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL +tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker framework javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL tb tail_build\prj nmake - all tb_prj NULL commit 032df7e9bfafeb93925959626b793cec17a4 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Dec 20 19:38:30 2011 +0100 gbuild: these targets depend on svx/globlmn.hrc diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 1611f9a..7e588d1 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -54,4 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\ basctl/source/dlged/managelang.src \ )) +$(call gb_SrsTarget_get_target,basctl/res) :| $(OUTDIR)/inc/svx/globlmn.hrc + # vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk index 55aeeb0..76baa19 100644 --- a/reportdesign/AllLangResTarget_rpt.mk +++ b/reportdesign/AllLangResTarget_rpt.mk @@ -45,4 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\ reportdesign/source/core/resource/strings.src \ )) +$(call gb_SrsTarget_get_target,reportdesign/res) :| $(OUTDIR)/inc/svx/globlmn.hrc + # vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index c41b5b8..23edf34 100644 --- a/reportdesign/AllLangResTarget_rptui.mk +++ b/reportdesign/AllLangResTarget_rptui.mk @@ -54,4 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\ reportdesign/source/ui/report/report.src \ )) +$(call gb_SrsTarget_get_target,reportdesign/rptui) :| $(OUTDIR)/inc/svx/globlmn.hrc + # vim: set noet sw=4 ts=4: diff --git
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/pl_PL.xml | 62 ++ 1 file changed, 62 insertions(+) New commits: commit 28b1abe11c1bfc644701f62096fce7fcfafaaa93 Author: Mateusz Zasuwik mzasu...@gmail.com Date: Tue Dec 20 20:43:33 2011 +0100 genitive case month names for [pl-PL] diff --git a/i18npool/source/localedata/data/pl_PL.xml b/i18npool/source/localedata/data/pl_PL.xml index 1956896..2ed2ea6 100644 --- a/i18npool/source/localedata/data/pl_PL.xml +++ b/i18npool/source/localedata/data/pl_PL.xml @@ -290,6 +290,68 @@ DefaultFullNamegrudzieÅ/DefaultFullName /Month /MonthsOfYear + GenitiveMonths +Month + MonthIDjan/MonthID + DefaultAbbrvNameI/DefaultAbbrvName + DefaultFullNamestycznia/DefaultFullName +/Month +Month + MonthIDfeb/MonthID + DefaultAbbrvNameII/DefaultAbbrvName + DefaultFullNamelutego/DefaultFullName +/Month +Month + MonthIDmar/MonthID + DefaultAbbrvNameIII/DefaultAbbrvName + DefaultFullNamemarca/DefaultFullName +/Month +Month + MonthIDapr/MonthID + DefaultAbbrvNameIV/DefaultAbbrvName + DefaultFullNamekwietnia/DefaultFullName +/Month +Month + MonthIDmay/MonthID + DefaultAbbrvNameV/DefaultAbbrvName + DefaultFullNamemaja/DefaultFullName +/Month +Month + MonthIDjun/MonthID + DefaultAbbrvNameVI/DefaultAbbrvName + DefaultFullNameczerwca/DefaultFullName +/Month +Month + MonthIDjul/MonthID + DefaultAbbrvNameVII/DefaultAbbrvName + DefaultFullNamelipca/DefaultFullName +/Month +Month + MonthIDaug/MonthID + DefaultAbbrvNameVIII/DefaultAbbrvName + DefaultFullNamesierpnia/DefaultFullName +/Month +Month + MonthIDsep/MonthID + DefaultAbbrvNameIX/DefaultAbbrvName + DefaultFullNamewrzeÅnia/DefaultFullName +/Month +Month + MonthIDoct/MonthID + DefaultAbbrvNameX/DefaultAbbrvName + DefaultFullNamepaździernika/DefaultFullName +/Month +Month + MonthIDnov/MonthID + DefaultAbbrvNameXI/DefaultAbbrvName + DefaultFullNamelistopada/DefaultFullName +/Month +Month + MonthIDdec/MonthID + DefaultAbbrvNameXII/DefaultAbbrvName + DefaultFullNamegrudnia/DefaultFullName +/Month + /GenitiveMonths Eras Era EraIDbc/EraID ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc svx/Library_svxcore.mk svx/Package_inc.mk svx/source unusedcode.easy
svx/Library_svxcore.mk |1
svx/Package_inc.mk |1
svx/inc/svx/sdrcomment.hxx | 108 ---
svx/inc/svx/svdpage.hxx |9 ---
svx/source/svdraw/sdrcomment.cxx | 99 ---
unusedcode.easy |5 -
6 files changed, 223 deletions(-)
New commits:
commit 9148757cc823efa0ac6dfe0a9a825bae47cb31fa
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Dec 20 22:23:33 2011 +0100
callcather: remove sdr::Comment
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index f7b3be7..508622f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -305,7 +305,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/clonelist \
svx/source/svdraw/gradtrns \
svx/source/svdraw/polypolygoneditor \
-svx/source/svdraw/sdrcomment \
svx/source/svdraw/sdrhittesthelper \
svx/source/svdraw/sdrmasterpagedescriptor \
svx/source/svdraw/sdrpagewindow \
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 60b576a..bd07e7b 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -378,7 +378,6 @@ $(eval $(call
gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx)
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx))
-$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx))
diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx
deleted file mode 100644
index f89e9ac..000
--- a/svx/inc/svx/sdrcomment.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _SDR_COMMENT_HXX
-#define _SDR_COMMENT_HXX
-
-#include sal/types.h
-#include tools/date.hxx
-#include rtl/ustring.hxx
-#include basegfx/point/b2dpoint.hxx
-
-#include vector
-
-//
-// predeclarations
-
-//
-
-namespace sdr
-{
-class Comment
-{
-// counting ID
-sal_uInt32 mnID;
-
-// creation date
-DatemaCreationDate;
-
-// name of creator
-::rtl::OUString maUserName;
-
-// text content
-::rtl::OUString maText;
-
-// position
-basegfx::B2DPoint maPosition;
-
-public:
-Comment(
-sal_uInt32 nID,
-Date aCreationDate,
-const ::rtl::OUString rUserName,
-const ::rtl::OUString rText,
-const basegfx::B2DPoint rPosition);
-~Comment();
-
-// operator for sorting the vector by mnID
-sal_Bool operator(const Comment rCandidate) const { return (mnID
rCandidate.mnID); }
-
-// comparison operators
-sal_Bool operator==(const Comment rCandidate) const;
-sal_Bool operator!=(const Comment rCandidate) const { return
!(operator==(rCandidate)); }
-
-// access to ID, read only
-sal_uInt32 GetID() const { return mnID; }
-
-// access to CreationDate
-Date GetCreationDate() const { return maCreationDate; }
[Libreoffice-commits] .: 4 commits - android/experiments sal/android sal/inc sal/osl
android/experiments/DocumentLoader/build.xml | 114 ++
android/experiments/DocumentLoader/project.properties | 11 +
sal/android/android_native_app_glue.c |2
sal/inc/sal/main.h|6
sal/osl/android/jni/Android.mk| 23 ---
sal/osl/android/jni/Application.mk|2
6 files changed, 129 insertions(+), 29 deletions(-)
New commits:
commit 5e3059834e30276e520b8e0f701351d51af5c604
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Dec 21 00:43:02 2011 +0200
Need visibility markup for ANativeActivity_onCreate() too
diff --git a/sal/android/android_native_app_glue.c
b/sal/android/android_native_app_glue.c
index 8ff9f69..440f3db 100644
--- a/sal/android/android_native_app_glue.c
+++ b/sal/android/android_native_app_glue.c
@@ -414,7 +414,7 @@ static void onInputQueueDestroyed(ANativeActivity*
activity, AInputQueue* queue)
android_app_set_input((struct android_app*)activity-instance, NULL);
}
-void ANativeActivity_onCreate(ANativeActivity* activity,
+__attribute__ ((visibility(default))) void
ANativeActivity_onCreate(ANativeActivity* activity,
void* savedState, size_t savedStateSize) {
LOGI(Creating: %p\n, activity);
activity-callbacks-onDestroy = onDestroy;
commit 73b54eb92ea8add31efdfb40b86c2ea2b3f78942
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Dec 21 00:03:34 2011 +0200
Need visibility markup for lo_main() too
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index f44a200..49c8b5d 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -120,11 +120,11 @@ static int sal_main(void);
#elif defined ANDROID
#ifdef __cplusplus
-extern C void lo_main(int argc, char **argv);
+extern C __attribute__ ((visibility(default))) void lo_main(int argc, char
**argv);
#endif
#define SAL_MAIN_WITH_ARGS_IMPL \
-void lo_main(int argc, char **argv) \
+__attribute__ ((visibility(default))) void lo_main(int argc, char **argv) \
{ \
sal_detail_initialize(argc, argv); \
sal_main_with_args(argc, argv); \
@@ -132,7 +132,7 @@ void lo_main(int argc, char **argv) \
}
#define SAL_MAIN_IMPL \
-void lo_main(int argc, char **argv) \
+__attribute__ ((visibility(default))) void lo_main(int argc, char **argv) \
{ \
sal_detail_initialize(argc, argv); \
sal_main(); \
commit eae42329c2733f55969a9342edcfd320d3f6c156
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Dec 20 18:13:24 2011 +0200
Add a couple of missing files
diff --git a/android/experiments/DocumentLoader/build.xml
b/android/experiments/DocumentLoader/build.xml
new file mode 100644
index 000..5d96019
--- /dev/null
+++ b/android/experiments/DocumentLoader/build.xml
@@ -0,0 +1,114 @@
+?xml version=1.0 encoding=UTF-8?
+project name=LibreOfficeDocumentLoader default=help
+
+!-- The local.properties file is created and updated by the 'android'
tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. --
+loadproperties srcFile=local.properties /
+
+!-- The ant.properties file can be created by you. It is only edited by
the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ --
+property file=ant.properties /
+
+!-- The project.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+
+ This contains project specific properties such as project target, and
library
+ dependencies. Lower level build properties are stored in
ant.properties
+ (or in .classpath for Eclipse projects).
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. --
+loadproperties srcFile=project.properties /
+
+!-- quick check on sdk.dir --
+fail
+message=sdk.dir is missing. Make sure to generate
local.properties using 'android update project'
+unless=sdk.dir
+/
+
+
+!-- extension targets. Uncomment the ones where you want to do custom work
+ in between standard targets --
+!--
+target name=-pre-build
+/target
+target name=-pre-compile
+/target
+
+/* This
