avmedia/source/quicktime/player.mm | 1
basctl/source/dlged/dlged.cxx | 2
basic/source/basmgr/basmgr.cxx | 2
configure.in | 15 ++-
connectivity/source/commontools/makefile.mk | 3
connectivity/source/cpool/makefile.mk | 3
connectivity/source/drivers/ado/makefile.mk | 4
connectivity/source/drivers/calc/makefile.mk | 4
connectivity/source/drivers/dbase/makefile.mk | 3
connectivity/source/drivers/file/makefile.mk | 3
connectivity/source/drivers/flat/makefile.mk | 3
connectivity/source/drivers/jdbc/makefile.mk | 3
connectivity/source/drivers/mysql/makefile.mk | 3
connectivity/source/drivers/odbc/makefile.mk | 4
connectivity/source/manager/makefile.mk | 3
connectivity/source/resource/makefile.mk | 3
connectivity/source/sdbcx/makefile.mk | 3
cppu/inc/com/sun/star/uno/Any.hxx | 12 +-
dbaccess/source/ui/browser/unodatbr.cxx | 7 +
dbaccess/source/ui/misc/UITools.cxx | 22 ++---
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
distro-configs/LibreOfficeMacOSX.conf | 1
distro-configs/LibreOfficeWin32.conf | 1
distro-configs/LibreOfficeWin64.conf | 1
extensions/source/macosx/spotlight/OOoContentDataParser.m | 1
extensions/source/macosx/spotlight/OOoMetaDataParser.m | 1
fpicker/source/aqua/CFStringUtilities.hxx | 2
pyuno/zipcore/makefile.mk | 4
shell/source/unix/sysshell/makefile.mk | 2
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx | 2
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 44
----------
slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h | 9 ++
slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m | 4
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 22 -----
vcl/aqua/source/dtrans/DropTarget.cxx | 5 -
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 6 -
vcl/aqua/source/gdi/aquaprintview.mm | 1
vcl/aqua/source/gdi/salatslayout.cxx | 4
vcl/aqua/source/gdi/salbmp.cxx | 1
vcl/aqua/source/gdi/salgdiutils.cxx | 2
vcl/aqua/source/window/salframeview.mm | 2
vcl/inc/aqua/aquavcltypes.h | 2
42 files changed, 71 insertions(+), 151 deletions(-)
New commits:
commit feb4ce887f37fa9208ea68f83eca68cb090c2ff6
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Apr 24 10:52:32 2012 +0300
Use blank as the false value for ENABLE_CAIRO_CANVAS, too
diff --git a/configure.in b/configure.in
index c9f270b..8a726ee 100644
--- a/configure.in
+++ b/configure.in
@@ -8680,7 +8680,7 @@ elif test -z "$enable_cairo_canvas"; then
enable_cairo_canvas=yes
fi
-ENABLE_CAIRO_CANVAS="FALSE"
+ENABLE_CAIRO_CANVAS=""
if test "$enable_cairo_canvas" = "yes"; then
ENABLE_CAIRO_CANVAS="TRUE"
fi
commit 7e1516124bb05f9f40e1d724688b7b1a80327dfe
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Apr 24 10:41:59 2012 +0300
Hardcode cairo canvas off for Mac OS X and Windows
Do not depend on a distro-configs file to disable it. It is supposed
to be optional to pass a --with-distro option. Running a bare
./autogen.sh is supposed to produce a working configuration.
diff --git a/configure.in b/configure.in
index a1568ec..c9f270b 100644
--- a/configure.in
+++ b/configure.in
@@ -702,7 +702,7 @@ AC_ARG_ENABLE(split-opt-features,
AC_ARG_ENABLE(cairo-canvas,
[ --disable-cairo-canvas Determines whether to build the Cairo canvas on
platforms where Cairo is available.
-],,enable_cairo_canvas=yes)
+])
AC_ARG_ENABLE(librsvg,
AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal/fully-internal>],
@@ -8671,9 +8671,18 @@ if test "$enable_split_opt_features" = "yes"; then
fi
AC_SUBST(SPLIT_OPT_FEATURES)
+if test $_os = Darwin -o $_os = WINNT; then
+ if test "$enable_cairo_canvas" = yes; then
+ AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform])
+ fi
+ enable_cairo_canvas=no
+elif test -z "$enable_cairo_canvas"; then
+ enable_cairo_canvas=yes
+fi
+
ENABLE_CAIRO_CANVAS="FALSE"
if test "$enable_cairo_canvas" = "yes"; then
- ENABLE_CAIRO_CANVAS="TRUE"
+ ENABLE_CAIRO_CANVAS="TRUE"
fi
AC_SUBST(ENABLE_CAIRO_CANVAS)
diff --git a/distro-configs/LibreOfficeMacOSX.conf
b/distro-configs/LibreOfficeMacOSX.conf
index 9366a04..108ef81 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,7 +1,6 @@
--with-vendor=The Document Foundation
--enable-epm
--enable-binfilter
---disable-cairo-canvas
--with-java-target-version=1.5
--enable-ext-presenter-minimizer
--enable-ext-presenter-console
diff --git a/distro-configs/LibreOfficeWin32.conf
b/distro-configs/LibreOfficeWin32.conf
index 9bf7609..f608e9b 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -8,7 +8,6 @@
--with-java-target-version=1.5
--disable-activex-component
--enable-binfilter
---disable-cairo-canvas
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-wiki-publisher
diff --git a/distro-configs/LibreOfficeWin64.conf
b/distro-configs/LibreOfficeWin64.conf
index 66404d4..b4e21c6 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -2,7 +2,6 @@
--without-agfa-monotype-fonts
--with-java-target-version=1.5
--enable-cl-x64
---disable-cairo-canvas
--disable-activex-component
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
commit 0d0b7947aa7c7e9b1dafee8b99211b43f2ca1668
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 23:38:18 2012 +0300
WaE: implicit conversion changes signedness
diff --git a/cppu/inc/com/sun/star/uno/Any.hxx
b/cppu/inc/com/sun/star/uno/Any.hxx
index 56a782e..fbb3d5b 100644
--- a/cppu/inc/com/sun/star/uno/Any.hxx
+++ b/cppu/inc/com/sun/star/uno/Any.hxx
@@ -306,7 +306,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny,
sal_uInt16 & value ) S
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
- value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
+ value = (sal_uInt16)( * reinterpret_cast< const sal_Int8 * >(
rAny.pData ) );
return sal_True;
case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT:
@@ -345,10 +345,10 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny,
sal_uInt32 & value ) S
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
- value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
+ value = (sal_uInt32)( * reinterpret_cast< const sal_Int8 * >(
rAny.pData ) );
return sal_True;
case typelib_TypeClass_SHORT:
- value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
+ value = (sal_uInt32)( * reinterpret_cast< const sal_Int16 * >(
rAny.pData ) );
return sal_True;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
@@ -396,16 +396,16 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny,
sal_uInt64 & value ) S
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
- value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
+ value = (sal_uInt64)( * reinterpret_cast< const sal_Int8 * >(
rAny.pData ) );
return sal_True;
case typelib_TypeClass_SHORT:
- value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
+ value = (sal_uInt64)( * reinterpret_cast< const sal_Int16 * >(
rAny.pData ) );
return sal_True;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
return sal_True;
case typelib_TypeClass_LONG:
- value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
+ value = (sal_uInt64)( * reinterpret_cast< const sal_Int32 * >(
rAny.pData ) );
return sal_True;
case typelib_TypeClass_UNSIGNED_LONG:
value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
commit 51c0a44e91a04b791de51678d3374903a5252d88
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 22:50:36 2012 +0300
Bin weird DBGUTIL_OJ crack
diff --git a/connectivity/source/commontools/makefile.mk
b/connectivity/source/commontools/makefile.mk
index 686f6d6..36d25cc 100644
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -31,9 +31,6 @@ PRJNAME=connectivity
TARGET=commontools
# --- Settings -----------------------------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/dbtools.pmk
diff --git a/connectivity/source/cpool/makefile.mk
b/connectivity/source/cpool/makefile.mk
index a1424dd..a969bd3 100644
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -33,9 +33,6 @@ TARGET=dbpool
ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/ado/makefile.mk
b/connectivity/source/drivers/ado/makefile.mk
index 9994d4e..e4014cc 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -33,10 +33,6 @@ VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
.INCLUDE : $(PRJ)$/version.mk
.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/connectivity/source/drivers/calc/makefile.mk
b/connectivity/source/drivers/calc/makefile.mk
index d36438a..31ec024 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -35,10 +35,6 @@ VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/dbase/makefile.mk
b/connectivity/source/drivers/dbase/makefile.mk
index 5c3344b..1ffb408 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -33,9 +33,6 @@ TARGET=dbase
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/file/makefile.mk
b/connectivity/source/drivers/file/makefile.mk
index 0b21336..fe90fb2 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -34,9 +34,6 @@ USE_DEFFILE=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/flat/makefile.mk
b/connectivity/source/drivers/flat/makefile.mk
index 0fe8579..58f3ccb 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -33,9 +33,6 @@ TARGET=flat
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/jdbc/makefile.mk
b/connectivity/source/drivers/jdbc/makefile.mk
index 4229c8f..ccbff3e 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -34,9 +34,6 @@ ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/mysql/makefile.mk
b/connectivity/source/drivers/mysql/makefile.mk
index 453f4b6..642784e 100644
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -34,9 +34,6 @@ ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/drivers/odbc/makefile.mk
b/connectivity/source/drivers/odbc/makefile.mk
index 3c79b49..e987ec3 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -41,10 +41,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/manager/makefile.mk
b/connectivity/source/manager/makefile.mk
index 4880407..c78a356 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -34,9 +34,6 @@ ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/version.mk
diff --git a/connectivity/source/resource/makefile.mk
b/connectivity/source/resource/makefile.mk
index b494418..389c98c 100644
--- a/connectivity/source/resource/makefile.mk
+++ b/connectivity/source/resource/makefile.mk
@@ -38,9 +38,6 @@ TARGET3=sdberr
ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/dbtools.pmk
diff --git a/connectivity/source/sdbcx/makefile.mk
b/connectivity/source/sdbcx/makefile.mk
index c036e83..16fc3ec 100644
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
@@ -33,9 +33,6 @@ TARGET=sdbcx
ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/dbtools.pmk
commit 12b0b323cb1dc1226d480aa86cd7328765743fce
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 21:29:13 2012 +0300
WaE: equality comparison with extraneous parentheses
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 9343309..e6dec85 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1408,7 +1408,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
// no conn for any reason -> select the next
or previous tab win
if(bForward)
{
- if ((aIter->second ==
m_aTableMap.rbegin()->second))
+ if ( aIter->second ==
m_aTableMap.rbegin()->second )
pNextWin = m_aTableMap.begin()->second;
else
{
commit 83079e1fdd729492a6829f005f9ba937493770b1
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 21:25:38 2012 +0300
WaE: using the result of an assignment as a condition without parentheses
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 431f142..3474768 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1370,54 +1370,54 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32
_nDataType,const OTypeInfoMap& _rType
switch(_nDataType)
{
case DataType::TINYINT:
- if( pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo))
+ if( (pTypeInfo =
queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo) ) )
break;
// run through
case DataType::SMALLINT:
- if( pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo))
+ if( (pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo)
) )
break;
// run through
case DataType::INTEGER:
- if( pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo))
+ if( (pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo) )
)
break;
// run through
case DataType::FLOAT:
- if( pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo))
+ if( (pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo) ) )
break;
// run through
case DataType::DATE:
case DataType::TIME:
if( DataType::DATE == _nDataType || DataType::TIME == _nDataType )
{
- if( pTypeInfo =
queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo))
+ if( (pTypeInfo =
queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo) ) )
break;
}
// run through
case DataType::TIMESTAMP:
case DataType::REAL:
case DataType::BIGINT:
- if ( pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo)
)
+ if ( (pTypeInfo =
queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) ) )
break;
// run through
case DataType::DOUBLE:
- if ( pTypeInfo =
queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) )
+ if ( (pTypeInfo =
queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) ) )
break;
// run through
case DataType::NUMERIC:
pTypeInfo = queryTypeInfoByType(DataType::DECIMAL,_rTypeInfo);
break;
case DataType::DECIMAL:
- if ( pTypeInfo =
queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) )
+ if ( (pTypeInfo =
queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) ) )
break;
- if ( pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo)
)
+ if ( (pTypeInfo =
queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) ) )
break;
break;
case DataType::VARCHAR:
- if ( pTypeInfo =
queryTypeInfoByType(DataType::LONGVARCHAR,_rTypeInfo) )
+ if ( (pTypeInfo =
queryTypeInfoByType(DataType::LONGVARCHAR,_rTypeInfo) ) )
break;
break;
case DataType::LONGVARCHAR:
- if ( pTypeInfo = queryTypeInfoByType(DataType::CLOB,_rTypeInfo) )
+ if ( (pTypeInfo = queryTypeInfoByType(DataType::CLOB,_rTypeInfo)
) )
break;
break;
default:
commit 23670b4dc7881d1aea9088c2cd89f2b0a3846dce
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 21:22:26 2012 +0300
WaE: use of logical '&&' with constant operand
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 3080e56..8ec8420 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2275,6 +2275,12 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry,
SvLBoxEntry*, _pParent)
if (xWarnings.is())
{
SQLExceptionInfo aWarnings(xWarnings->getWarnings());
+#if 0
+// Obviously this if test is always false. So to avoid a Clang warning
+// "use of logical '&&' with constant operand" I put this in #if
+// 0. Yeah, I know it is fairly likely nobody will ever read this
+// comment and make a decision what to do here, so I could as well
+// have just binned this...
if (aWarnings.isValid() && sal_False)
{
SQLContext aContext;
@@ -2284,6 +2290,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry,
SvLBoxEntry*, _pParent)
aWarnings = aContext;
showError(aWarnings);
}
+#endif
// TODO: we need a better concept for these warnings:
// something like "don't show any warnings for this
datasource, again" would be nice
// But this requires an extension of the
InteractionHandler and an additional property on the data source
commit c1f755c34ee7aabb00900728b71fdc2ba1185c54
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 19:19:47 2012 +0300
WaE: unused variable
diff --git a/avmedia/source/quicktime/player.mm
b/avmedia/source/quicktime/player.mm
index 15c39e9..81a986a 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -364,7 +364,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
{
uno::Reference< ::media::XPlayerWindow > xRet;
awt::Size aSize(
getPreferredPlayerWindowSize() );
- NSSize nsSize(
NSMakeSize(aSize.Width, aSize.Height) );
OSL_TRACE( "Player::createPlayerWindow %d %d length: %d", aSize.Width,
aSize.Height, aArguments.getLength() );
commit 9273e5466e6b35ae1a61bb9fdc03140a0e6d9d85
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 19:12:43 2012 +0300
WaE: implicitly declaring C library function 'objc_msgSend'
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m
b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index d5abd1d..9d957c3 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -26,6 +26,7 @@
*
*************************************************************************/
+#include <objc/objc-runtime.h>
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED <
1050
@class CALayer;
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index cd69772..d878f80 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -26,6 +26,7 @@
*
*************************************************************************/
+#include <objc/objc-runtime.h>
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED <
1050
@class CALayer;
commit 4005503177b0525aeb4f440b903cb644bdf2b54c
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 19:07:18 2012 +0300
Bin commented-out code
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index c173a01..909f794 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -168,7 +168,6 @@ protected:
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
-// bool createWindow( Window* pPWindow );
void createTexture(GLuint* texID,
bool useMipmap,
uno::Sequence<sal_Int8>& data,
@@ -349,47 +348,6 @@ bool OGLTransitionerImpl::initialize( const Reference<
presentation::XSlideShowV
return cbGLXPresent;
}
-/*bool OGLTransitionerImpl::createWindow( Window* pPWindow )
-{
- const SystemEnvData* sysData(pPWindow->GetSystemData());
-
- GLWin.apView = sysData->pView;
-
- NSOpenGLPixelFormat* fmt = [AquaOpenGLView defaultPixelFormat];
- Window *pFrameWindow = pPWindow->GetWindow(WINDOW_FRAME);
- Size aFrameSize( pFrameWindow->GetSizePixel() );
- Point aScreen( pPWindow->OutputToScreenPixel( Point() ) );
- GLWin.aInitFrame = (NSRect){ { aScreen.X(), aFrameSize.Height() -
GLWin.Height - aScreen.Y() }, { GLWin.Width, GLWin.Height } };
-
- GLWin.pAquaOpenGLView = [[NSOpenGLView alloc]initWithFrame:
GLWin.aInitFrame pixelFormat: fmt];
- OSL_ENSURE(GLWin.pAquaOpenGLView, "Could not create NSOPenGLView");
- if( !GLWin.pAquaOpenGLView )
- return false;
-//
- GLWin.pOpenGLContext = [GLWin.pAquaOpenGLView openGLContext];
- [GLWin.pOpenGLContext retain];
- [GLWin.pAquaOpenGLView setOpenGLContext:GLWin.pOpenGLContext];
- [sysData->pView addSubview:GLWin.pAquaOpenGLView];
-//
- if( pWindow )
- {
- pWindow->SetMouseTransparent( sal_True );
- pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( sal_False );
- pWindow->SetControlForeground();
- pWindow->SetControlBackground();
- pWindow->EnablePaint(sal_False);
-
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
- // GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
-// GLWin.win = pChildSysData->aWindow;
-
- return true;
- }
-
- return false;
-}
-*/
-
bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference<
presentation::XSlideShowView >& xView )
{
osl::MutexGuard const guard( m_aMutex );
commit 2a0444f7ad5178223efcb2870735c6115f30eb89
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 19:04:40 2012 +0300
WaE: assigning to 'AquaOpenGLView *' from incompatible type 'NSOpenGLView *'
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 8d2ab4e..c173a01 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -425,7 +425,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView(
const Reference< presenta
Point aScreen( pPWindow->OutputToScreenPixel( Point() ) );
GLWin.aInitFrame = (NSRect){ { aScreen.X(), aFrameSize.Height() -
GLWin.Height - aScreen.Y() }, { GLWin.Width, GLWin.Height } };
- GLWin.pAquaOpenGLView = [[NSOpenGLView alloc]initWithFrame:
GLWin.aInitFrame pixelFormat: fmt];
+ GLWin.pAquaOpenGLView = (AquaOpenGLView *)[[NSOpenGLView
alloc]initWithFrame: GLWin.aInitFrame pixelFormat: fmt];
OSL_ENSURE(GLWin.pAquaOpenGLView, "Could not create NSOPenGLView");
if( !GLWin.pAquaOpenGLView )
return false;
commit efc80f71f54d73a50b89721132a9c5668d3da39d
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 19:02:23 2012 +0300
Add hopefully helpful comment
diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h
b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h
index b4b8f9f..c422886 100644
--- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h
+++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h
@@ -8,6 +8,15 @@
// the most interesting is there : in OGLTrans, we use an NSView*
// and subclass the NSView to create an OpenGLView does the trick
+// I can't really parse the above
+
+// This is weird code. AquaOpenGLView objects are actually allocated
+// as NSOpenGLView objetcs, and the _openGLContext and _pixelFormat
+// fields are copied from the NSOpenGLView.h header so that it has the
+// same structure as NSOpenGLView . Surely this could be done in a
+// better way? Is this because of some pre-10.4 SDK compatibility,
+// which is irrelevant now?
+
@interface AquaOpenGLView : NSView
{
@private
commit 72108b8cba03a481c8b3cac32c3fc3d2e332eb1c
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 18:59:08 2012 +0300
WaE: 'SceneObject' has virtual functions but non-virtual destructor
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
index 7e64b34..5f21831 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
@@ -183,6 +183,8 @@ public:
void pushPrimitive (const Primitive &p);
+ virtual ~SceneObject() {}
+
protected:
/** All the surrounding scene primitives
*/
commit 309c7406840e42f0df18629319885209d66c0be3
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 18:33:35 2012 +0300
WaE: when type is in parentheses, array cannot have dynamic size
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx
b/vcl/aqua/source/gdi/salgdiutils.cxx
index 66e335c..5c799e3 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -256,7 +256,7 @@ void AquaSalGraphics::RefreshRect(float lX, float lY, float
lWidth, float lHeigh
CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint*
pPtAry)
{
- CGPoint *CGpoints = new (CGPoint[nPoints]);
+ CGPoint *CGpoints = new CGPoint[nPoints];
if ( CGpoints )
{
for(sal_uLong i=0;i<nPoints;i++)
commit 77eec72f7bd77bccb7349ff50472e19993b4c901
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 18:31:46 2012 +0300
WaE: delete called on class that is abstract but has non-virtual destructor
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 65a132f..2bc3756 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -298,6 +298,7 @@ public:
virtual void SkipPixel( sal_uInt32 nPixel ) = 0;
virtual ColorData ReadPixel() = 0;
virtual void WritePixel( ColorData nColor ) = 0;
+ virtual ~ImplPixelFormat() { }
};
class ImplPixelFormat32 : public ImplPixelFormat
commit 1dfa83bf4e8a42e25fafca8b072f839423e3c0bf
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 18:28:56 2012 +0300
WaE: 'ATSLayout::InitFont' hides overloaded virtual function
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx
b/vcl/aqua/source/gdi/salatslayout.cxx
index f51346f..a8fc7c5 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -71,7 +71,7 @@ public:
const ImplFontData* GetFallbackFontData( sal_GlyphId ) const;
- virtual void InitFont();
+ virtual void InitFont() const;
virtual void MoveGlyph( int nStart, long nNewXPos );
virtual void DropGlyph( int nStart );
virtual void Simplify( bool bIsBase );
@@ -1105,7 +1105,7 @@ void ATSLayout::InvalidateMeasurements()
// glyph fallback is supported directly by Aqua
// so methods used only by MultiSalLayout can be dummy implementated
bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const {
return false; }
-void ATSLayout::InitFont() {}
+void ATSLayout::InitFont() const {}
void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
void ATSLayout::DropGlyph( int /*nStart*/ ) {}
void ATSLayout::Simplify( bool /*bIsBase*/ ) {}
commit 129f91c334c14f6e2337a638a780af1194becd1b
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 18:22:55 2012 +0300
WaE: unused functions
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index d0146f8..1f8595d 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -72,23 +72,6 @@ namespace // private
typedef vector<sal_Unicode> UnicodeBuffer;
- OUString NSStringToOUString(NSString* cfString)
- {
- BOOST_ASSERT(cfString && "Invalid parameter");
-
- const char* utf8Str = [cfString UTF8String];
- unsigned int len = rtl_str_getLength(utf8Str);
-
- return OUString(utf8Str, len, RTL_TEXTENCODING_UTF8);
- }
-
- NSString* OUStringToNSString(const OUString& ustring)
- {
- OString utf8Str = OUStringToOString(ustring, RTL_TEXTENCODING_UTF8);
- return [NSString stringWithCString: utf8Str.getStr() encoding:
NSUTF8StringEncoding];
- }
-
-
NSString* PBTYPE_SODX =
@"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star
Object Descriptor (XML)\"";
NSString* PBTYPE_SESX =
@"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed
Source (XML)\"";
NSString* PBTYPE_SLSDX =
@"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link
Source Descriptor (XML)\"";
@@ -170,11 +153,6 @@ namespace // private
return (theType == CPPUTYPE_SEQINT8);
}
- inline bool isOUStringType(const Type& theType)
- {
- return (theType == CPPUTYPE_OUSTRING);
- }
-
} // namespace private
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx
b/vcl/aqua/source/dtrans/DropTarget.cxx
index 1a25ab7..bb46e21 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -85,11 +85,6 @@ namespace /* private */
{
rPoint.y = bounds.size.height - rPoint.y;
}
-
- inline void CocoaToVCL(NSRect& rRect, const NSRect& bounds)
- {
- rRect.origin.y = bounds.size.height - (rRect.origin.y + rRect.size.height);
- }
}
commit 2c0731adc872a3ab73de929afcb5ee9c13417ca1
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 18:12:36 2012 +0300
WaE: incompatible pointer types
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index 3a97372..86e3dc4 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -157,7 +157,7 @@ static AquaSalFrame* getMouseContainerFrame()
pFrame->VCLToCocoa( aRect );
NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask:
mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
[pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are
no overlapping subviews within the receiver
- return pNSWindow;
+ return (SalFrameWindow *) pNSWindow;
}
-(AquaSalFrame*)getSalFrame
commit 8376b5e0000e8318e108e9eeab82b7acb2cd586d
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 16:57:00 2012 +0300
WaE: unused variable
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm
b/vcl/aqua/source/gdi/aquaprintview.mm
index 6337dd3..e67d728 100644
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -71,7 +71,6 @@
-(void)drawRect: (NSRect)rect
{
- NSPoint aPoint = [self locationOfPrintRect: rect];
mpInfoPrinter->setStartPageOffset( static_cast<int>(rect.origin.x),
static_cast<int>(rect.origin.y) );
NSSize aPaperSize = [mpInfoPrinter->getPrintInfo() paperSize];
int nPage = (int)(aPaperSize.width * rect.origin.y + rect.origin.x);
commit 95187d3bf48dbd14e4555f9a96987f4e5bcf9c22
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 16:48:54 2012 +0300
WaE: extra tokens at end of #endif directive
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx
b/fpicker/source/aqua/CFStringUtilities.hxx
index 7dc53a4..093b049 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -127,7 +127,7 @@ inline void DBG_PRINT_ENTRY(const char * classname, const
char * methodname, con
OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", classname, methodname, PARAMFILLER,
param1, value1, PARAMFILLER, param2, value2);
#if OSL_DEBUG_LEVEL > 1
NSLog(value2);
-#endif}
+#endif
}
commit a5554ed5637aa3e2e7f49486513463077413efc5
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 16:47:34 2012 +0300
WaE: incompatible pointer types: 'long *' vs. 'const GLint *'
diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
index 44e4f6d..64af815 100644
--- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
+++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
@@ -81,7 +81,11 @@ typedef int NSColorRenderingIntent;
- (void)prepareOpenGL
{
// for overriding to initialize OpenGL state, occurs after context creation
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ GLint swapInt = 1;
+#else
long swapInt = 1;
+#endif
[[self openGLContext] setValues:&swapInt
forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync
commit 157be160fd8c47f86e798a5ad117a8efbaad196a
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 16:43:41 2012 +0300
WaE: semicolon before method body is ignored
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index ec37193..3ed9040 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -485,7 +485,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
return self;
}
--(void)triggered:(id)pSender;
+-(void)triggered:(id)pSender
{
if( [pSender isMemberOfClass: [NSPopUpButton class]] )
{
@@ -526,7 +526,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
mpController->updateEnableState();
}
--(void)triggeredNumeric:(id)pSender;
+-(void)triggeredNumeric:(id)pSender
{
if( [pSender isMemberOfClass: [NSTextField class]] )
{
@@ -1118,7 +1118,7 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
#endif
@implementation AquaPrintAccessoryView
-+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController:
(vcl::PrinterController*)pController withState:
(PrintAccessoryViewState*)pState;
++(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController:
(vcl::PrinterController*)pController withState:
(PrintAccessoryViewState*)pState
{
const Sequence< PropertyValue >& rOptions( pController->getUIOptions() );
if( rOptions.getLength() == 0 )
commit 995de2b09e1917b23f61aa673f364b5e7bbe1909
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 16:39:45 2012 +0300
Reduce chatter
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index ce0a3a4..166fff4 100644
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -36,8 +36,10 @@ LIBTARGET=NO
UWINAPILIB =
.IF "$(SYSTEM_PYTHON)" == "YES"
+
systempython:
- @echo "Not building python-core because system python is being used"
+# nothing
+
.ELSE
.INCLUDE : pyversion.mk
diff --git a/shell/source/unix/sysshell/makefile.mk
b/shell/source/unix/sysshell/makefile.mk
index 93ca678..df97be9 100644
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -67,7 +67,7 @@ SHL1OBJS=$(SLOFILES)
.ELSE
dummy:
- @echo "Nothing to build for $(OS)"
+# nothing
.ENDIF
# --- Targets ------------------------------------------------------
commit aa155d9307bd519a2e615cc8bde29d0d9fb349b6
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 15:37:51 2012 +0300
WaE: equality comparison with extraneous parentheses
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 446d5ca..73d2005 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -483,7 +483,7 @@ void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
{
sal_Bool bRet = pFunc->MouseButtonUp( rMEvt );
- if( (eMode == DLGED_INSERT) )
+ if( eMode == DLGED_INSERT )
bCreateOK = bRet;
}
commit fd58025dc7379126738cf73908ec10e809348e6a
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 15:35:04 2012 +0300
Fix eleven year old typo
No idea if it has actually caused any uninteded behaviour, or if this
fix now then causes something to break.
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 3de240f..7fc19ed 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -2288,7 +2288,7 @@ Any LibraryContainer_Impl::getByName( const
::rtl::OUString& aName )
Reference< XNameContainer > xModuleContainer =
(XNameContainer*)new ModuleContainer_Impl( pLib );
- Reference< XNameContainer > xDialogContainer;
+ Reference< XNameContainer > xDialogContainer =
(XNameContainer*)new DialogContainer_Impl( pLib );
BasicLibInfo* pLibInfo = mpMgr->FindLibInfo( pLib );
commit 2aaa5f721f63528330498dce38038f3b43f85ca9
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Apr 23 14:33:52 2012 +0300
WaE: extra tokens at end of #endif directive
diff --git a/vcl/inc/aqua/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h
index 93003fa..4067d81 100644
--- a/vcl/inc/aqua/aquavcltypes.h
+++ b/vcl/inc/aqua/aquavcltypes.h
@@ -34,6 +34,6 @@
#import <AppKit/NSEvent.h>
#include "postmac.h"
-#endif _AQUAVCLTYPES_H
+#endif /* _AQUAVCLTYPES_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
