[Libreoffice-commits] .: solenv/bin
solenv/bin/mkdocs.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19428106ea6e1614205f6b818565daee56c9d11f Author: Thorsten Behrens tbehr...@novell.com Date: Fri Oct 7 10:14:59 2011 +0200 Miklos wants writerfilter doxygen-ified, too diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 3d6ba29..1e358e6 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -26,7 +26,7 @@ BINDIR=`dirname $0` . ./*.Set.sh # get list of modules in build order - bah, blows RAM disk, static list below -INPUT_PROJECTS=o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx cui chart2 dbaccess sd starmath sc sw +INPUT_PROJECTS=o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter cui chart2 dbaccess sd starmath sc sw # output directory for generated documentation BASE_OUTPUT=$1 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 683cd8d86febeb28d1cb79ec9fb4c7cef45042ef Author: Jan Holesovsky ke...@suse.cz Date: Fri Oct 7 10:48:12 2011 +0200 Indicate that the build was successful, and what to do next. diff --git a/Makefile.in b/Makefile.in index b7fd5f5..c2f6288 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,6 +18,17 @@ endif .PHONY : build dev-install all cross-build-toolset install distro-pack-install clean distclean findunusedcode all: build unitcheck + @echo + @echo LibreOffice build succesfully finished :-) + @echo +ifeq (@CROSS_COMPILING@,YES) + @echo Please consult README.cross how to install it. +else + @echo To install, issue: @GNUMAKE@ install + @echo Developers might prefer this way: @GNUMAKE@ dev-install + @echo To run smoketest, issue: @GNUMAKE@ check +endif + @echo build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gtk3' - 2 commits - vcl/inc vcl/unx
vcl/inc/generic/gendata.hxx |2
vcl/inc/unx/gtk/gtkinst.hxx | 19 +++--
vcl/inc/unx/saldisp.hxx |1
vcl/unx/generic/app/salinst.cxx |1
vcl/unx/gtk/app/gtkinst.cxx | 143
5 files changed, 145 insertions(+), 21 deletions(-)
New commits:
commit 68c653195aa42877fc83a108cc1d625bf5dabf69
Author: Michael Meeks michael.me...@suse.com
Date: Fri Oct 7 10:43:17 2011 +0100
generic: remove mistaken m_aFrames hiding parent's frame list
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 73e5277..ac97bad 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -327,7 +327,6 @@ protected:
boolm_bXinerama;
std::vector Rectangle m_aXineramaScreens;
std::vector int m_aXineramaScreenIndexMap;
-std::listSalFrame* m_aFrames;
std::listSalObject* m_aSalObjects;
boolm_bUseRandRWrapper; // don't use randr on gtk, use gdk
signals there
commit 1f5344aec735288894a3a4c2a6afb57a93f20ede
Author: Michael Meeks michael.me...@suse.com
Date: Thu Oct 6 22:22:39 2011 +0100
gtk3: make AnyInput to behave itself properly
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index ef7725f..10b0a09 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -51,7 +51,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
// for transient storage of unicode strings eg. 'u123' by input methods
rtl::OUString m_aUnicodeEntry;
public:
-SalGenericData( SalGenericDataType t ) : SalData(), m_eType( t ) {}
+SalGenericData( SalGenericDataType t ) : SalData(), m_eType( t ),
m_pDisplay( NULL ) {}
virtual ~SalGenericData() {}
virtual void Dispose() {}
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 3df5218..80497dd 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -82,19 +82,14 @@ public:
class GtkSalTimer;
#if GTK_CHECK_VERSION(3,0,0)
class GtkInstance : public SvpSalInstance
-{
-public:
-GtkInstance( SalYieldMutex* pMutex )
-: SvpSalInstance( pMutex )
#else
class GtkInstance : public X11SalInstance
+#endif
{
public:
-GtkInstance( SalYieldMutex* pMutex )
-: X11SalInstance( pMutex )
-#endif
-{}
+GtkInstance( SalYieldMutex* pMutex );
virtual ~GtkInstance();
+voidInit();
virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong
nStyle );
virtual SalFrame* CreateChildFrame( SystemParentData* pParent,
sal_uLong nStyle );
@@ -112,9 +107,17 @@ public:
virtual bool AnyInput( sal_uInt16 nType );
voidRemoveTimer (SalTimer *pTimer);
+
+// for managing a mirror of the in-flight un-dispatched gdk event queue
+voidaddEvent( sal_uInt16 nMask );
+voidsubtractEvent( sal_uInt16 nMask );
private:
std::vectorGtkSalTimer * m_aTimers;
boolIsTimerExpired();
+
+// count of in-flight un-dispatched gdk events of a given input type
+sal_uInt32 m_nAnyInput[16];
+voidresetEvents();
};
#endif // _VCL_GTKINST_HXX
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 1f1ab0b..a63ebae 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -167,6 +167,7 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
bRet = aInput.bRet;
}
+fprintf( stderr, AnyInput 0x%x = %s\n, nType, bRet ? true : false );
return bRet;
}
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 6e0cb6d..156e0d3 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -29,6 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_vcl.hxx
+#include string.h
#include osl/module.h
#include unx/gtk/gtkdata.hxx
#include unx/gtk/gtkinst.hxx
@@ -193,14 +194,130 @@ extern C
pSalData-Init();
pSalData-initNWF();
+pInstance-Init();
+
InitAtkBridge();
return pInstance;
}
}
+// Handling the event queue
+
+void GtkInstance::resetEvents()
+{
+memset( m_nAnyInput, 0, sizeof( m_nAnyInput ) );
+}
+
+void GtkInstance::addEvent( sal_uInt16 nMask )
+{
+sal_uInt16 nShift = 1;
+for (int i = 0; i 16; i++) {
+if( nMask nShift )
+m_nAnyInput[i]++;
+nShift = 1;
+}
+}
+
+void GtkInstance::subtractEvent( sal_uInt16 nMask )
+{
+sal_uInt16 nShift = 1;
+for (int i = 0; i 16; i++) {
+if( nMask nShift m_nAnyInput[i] 0 )
+m_nAnyInput[i]--;
+nShift = 1;
+}
+}
+
+extern C {
+// We catch events as they pop out of X and into gdk
+static GdkFilterReturn _sal_gtk_instance_filter_fn (GdkXEvent *_xevent,
+
[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/unx
vcl/unx/generic/gdi/salbmp.cxx|1 -
vcl/unx/generic/window/salobj.cxx |1 -
vcl/unx/gtk/app/gtkdata.cxx | 18 +-
vcl/unx/gtk/app/gtkinst.cxx |2 ++
vcl/unx/gtk/window/gtkframe.cxx | 37 ++---
5 files changed, 45 insertions(+), 14 deletions(-)
New commits:
commit ab5fe885321d0be4267a6772b91d04bede948e43
Author: Michael Meeks michael.me...@suse.com
Date: Fri Oct 7 11:29:18 2011 +0100
WaE: cleanup misc. redundant warnings, and silence the gtk2 case
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index d0201e3..44c1a71 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -218,7 +218,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
if( aDrawable nWidth nHeight nDrawableDepth )
{
SalDisplay* pSalDisp = GetGenericData()-GetSalDisplay();
-SalXLib*pXLib = pSalDisp-GetXLib();
Display*pXDisp = pSalDisp-GetDisplay();
// do not die on XError here
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index da09378..5ad6c40 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -273,7 +273,6 @@ X11SalObject::~X11SalObject()
{
std::list SalObject* rObjects =
GetGenericData()-GetSalDisplay()-getSalObjects();
rObjects.remove( this );
-SalDisplay* pSalDisp = GetGenericData()-GetSalDisplay();
GetGenericData()-ErrorTrapPush();
if ( maSecondary )
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index f5075a9..4fd338b 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -68,9 +68,9 @@ using namespace vcl_sal;
using ::rtl::OUString;
-/***
- * class GtkSalDisplay*
- ***/
+/***
+ * class GtkSalDisplay *
+ ***/
extern C {
GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
GdkEvent* event,
@@ -126,6 +126,9 @@ void signalKeysChanged( GdkKeymap*, gpointer data )
GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
#if !GTK_CHECK_VERSION(3,0,0)
pDisp-GetKeyboardName(true);
+#else
+(void)pDisp;
+#warning FIXME: impl. / check signalKeysChanged ...
#endif
}
@@ -192,6 +195,8 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent*
sys_event,
return aFilterReturn;
#else
+(void) sys_event;
+#warning FIXME: implement filterGdkEvent ...
return GDK_FILTER_CONTINUE;
#endif
}
@@ -202,7 +207,8 @@ void GtkSalDisplay::screenSizeChanged( GdkScreen* pScreen )
if (pScreen)
m_aFrames.front()-CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
#else
-#warning get this right
+(void)pScreen;
+#warning FIXME: implement screenSizeChanged ...
#endif
}
@@ -224,7 +230,9 @@ extern C
void GtkSalDisplay::initScreen( int nScreen ) const
{
#if GTK_CHECK_VERSION(3,0,0)
-// no colormaps handling in gtk 3 or need to init screens ...
+// No implementation needed for gt3k: no colormaps handling
+// or need to init screens ...
+(void)nScreen;
#else
if( nScreen 0 || nScreen = static_castint(m_aScreens.size()) )
nScreen = m_nDefaultScreen;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 156e0d3..597be51 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -235,6 +235,7 @@ extern C {
GdkEvent *event,
gpointer data)
{
+(void)event;
// FIXME: in theory this could be for non-X events but in reality it
never is.
XEvent *pXEvent = (XEvent *)_xevent;
sal_uInt16 nType;
@@ -341,6 +342,7 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent,
SystemWindowData* pWind
if( pWindowData )
return X11SalObject::CreateObject( pParent, pWindowData, bShow );
#else
+(void)pWindowData;
#warning FIXME: Missing CreateObject functionality ...
#endif
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 0b99e6d..cbd23ec 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -343,7 +343,9 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode )
}
static int debugQueuePureRedraw = 0;
+#if GTK_CHECK_VERSION(3,0,0)
static int debugRedboxRedraws = 0;
+#endif
void GtkSalFrame::doKeyCallback( guint state,
guint keyval,
@@ -787,8 +789,12 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
XFree(
[Libreoffice-commits] .: Branch 'feature/gtk3' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6fb32f4f3861b64c93fed9bebfd37b672fcc9939 Author: Jan Holesovsky ke...@suse.cz Date: Fri Oct 7 13:03:00 2011 +0200 Advise how to save yourself a rebuild with make dev-install. diff --git a/Makefile.in b/Makefile.in index c2f6288..a7d884c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,7 +25,7 @@ ifeq (@CROSS_COMPILING@,YES) @echo Please consult README.cross how to install it. else @echo To install, issue: @GNUMAKE@ install - @echo Developers might prefer this way: @GNUMAKE@ dev-install + @echo Developers might prefer this way: @GNUMAKE@ dev-install -o build @echo To run smoketest, issue: @GNUMAKE@ check endif @echo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/bug.xhtml
bug/bug.xhtml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 92b15e78a0b5e02ddecd54b22a0684ee95afcd1b Author: Loic Dachary l...@dachary.org Date: Fri Oct 7 13:15:33 2011 +0200 s/Localization/Localisation/ diff --git a/bug/bug.xhtml b/bug/bug.xhtml index add05de..185bf6d 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -120,7 +120,7 @@ /div div div class=components_icons - divimg src=icons/WRITER.png title=Text Document data=Writer alt=Text Document /img src=icons/Spreadsheet.png title=Spreadsheet data=Spreadsheet alt=Spreadsheet /img src=icons/Presentation.png title=Presentation data=Presentation alt=Presentation /img src=icons/Drawing.png title=Drawing data=Drawing alt=Drawing /img src=icons/Database.png title=Database data=Database alt=Database /img src=icons/Chart.png title=Chart data=Chart alt=Chart //divdivimg src=icons/Libreoffice.png title=Localization data=Localization alt=Localization /img src=icons/Documentation.png title=Documentation data=Documentation alt=Documentation /img src=icons/Extensions.png title=Extensions data=Extensions alt=Extensions /img src=icons/WWW.png title=Web Pages data=WWW alt=Web Pages /img src=icons/Libreoffice.png title=Contrib data=contrib alt=Contrib /img src=icons/Libreo ffice.png title=Linguistic data=Linguistic_component alt=Linguistic //divdivimg src=icons/Installation.png title=Installation data=Installation alt=Installation /img src=icons/Libreoffice.png title=BASIC data=BASIC alt=BASIC /img src=icons/Formula_editor.png title=Formula Editor data=Formula_editor alt=Formula Editor /img src=icons/PDF_export.png title=PDF Export data=PDF_export alt=PDF Export /img src=icons/Libreoffice.png title=User Interface data=UI alt=User Interface /img src=icons/Libreoffice.png title=Unspecified data=Libreoffice alt=Unspecified //div + divimg src=icons/WRITER.png title=Text Document data=Writer alt=Text Document /img src=icons/Spreadsheet.png title=Spreadsheet data=Spreadsheet alt=Spreadsheet /img src=icons/Presentation.png title=Presentation data=Presentation alt=Presentation /img src=icons/Drawing.png title=Drawing data=Drawing alt=Drawing /img src=icons/Database.png title=Database data=Database alt=Database /img src=icons/Chart.png title=Chart data=Chart alt=Chart //divdivimg src=icons/Libreoffice.png title=Localisation data=Localisation alt=Localisation /img src=icons/Documentation.png title=Documentation data=Documentation alt=Documentation /img src=icons/Extensions.png title=Extensions data=Extensions alt=Extensions /img src=icons/WWW.png title=Web Pages data=WWW alt=Web Pages /img src=icons/Libreoffice.png title=Contrib data=contrib alt=Contrib /img src=icons/Libreo ffice.png title=Linguistic data=Linguistic_component alt=Linguistic //divdivimg src=icons/Installation.png title=Installation data=Installation alt=Installation /img src=icons/Libreoffice.png title=BASIC data=BASIC alt=BASIC /img src=icons/Formula_editor.png title=Formula Editor data=Formula_editor alt=Formula Editor /img src=icons/PDF_export.png title=PDF Export data=PDF_export alt=PDF Export /img src=icons/Libreoffice.png title=User Interface data=UI alt=User Interface /img src=icons/Libreoffice.png title=Unspecified data=Libreoffice alt=Unspecified //div /div div class=component_comments_containercomponent_comments;/div /div ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/core/filterdetect.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b90a9e8877a71e33c439396e3fda0c53750748f8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 7 13:22:49 2011 +0100
WaE: unused variables
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 5c01b2e..c0bde4d 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -178,7 +178,7 @@ void FilterDetectDocHandler::parseRelationship( const
AttributeList rAttribs )
if ( xAbs.is() )
maTargetPath = xAbs-getPath();
}
-catch( Exception e)
+catch( const Exception )
{
}
}
@@ -620,7 +620,7 @@ Reference XInputStream
FilterDetect::extractUnencryptedPackage( MediaDescript
}
}
}
-catch( Exception )
+catch( const Exception )
{
}
@@ -685,7 +685,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence
PropertyValue rMediaDescSeq
aParser.parseStream( aZipStorage, CREATE_OUSTRING(
[Content_Types].xml ) );
}
}
-catch( Exception e )
+catch( const Exception )
{
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 11 commits - sw/qa sw/source uui/source vbahelper/source writerfilter/source
sw/qa/core/swdoc-test.cxx|7 ++-
sw/source/ui/index/cnttab.cxx| 10 ++--
sw/source/ui/vba/vbalistlevel.cxx|1
sw/source/ui/vba/vbastyle.cxx|3 -
sw/source/ui/vba/vbasystem.cxx |6 +-
sw/source/ui/vba/vbatabstops.cxx |4 -
uui/source/interactionhandler.cxx|1
vbahelper/source/msforms/vbalistcontrolhelper.cxx|1
vbahelper/source/vbahelper/vbashaperange.cxx | 26 +--
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx|6 +-
writerfilter/source/dmapper/FormControlHelper.cxx|2
writerfilter/source/dmapper/GraphicImport.hxx|2
writerfilter/source/dmapper/NumberingManager.cxx |2
writerfilter/source/dmapper/PropertyMap.cxx |2
writerfilter/source/ooxml/factoryimpl_ns.xsl |4 +
writerfilter/source/rtftok/rtftokenizer.cxx | 34 ++-
17 files changed, 69 insertions(+), 44 deletions(-)
New commits:
commit 8aeeb8eb06640ed454ba8aa660964368b977568e
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Oct 7 15:54:40 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index 696b52b..828c766 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -17,6 +17,7 @@ private:
public:
ListPropListener( const uno::Reference beans::XPropertySet xProps,
const uno::Any pvargIndex, const uno::Any pvarColumn );
+virtual ~ListPropListener() { };
virtual void setValueEvent( const css::uno::Any value );
virtual css::uno::Any getValueEvent();
};
commit fd5a9a65f0cadd046d2f67924ba9e3d0a380208f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Oct 7 15:52:44 2011 +0300
WaE: unreachable code
Interesting use of for loops with the body of the loop returning
unconditionally.
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx
b/vbahelper/source/vbahelper/vbashaperange.cxx
index 44f2845..417cb1f 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -129,7 +129,7 @@ ScVbaShapeRange::IncrementTop( double Increment ) throw
(uno::RuntimeException)
rtl::OUString SAL_CALL ScVbaShapeRange::getName() throw (uno::RuntimeException)
{
sal_Int32 nLen = getCount();
-for ( sal_Int32 index = 1; index = nLen; ++index )
+for ( sal_Int32 index = 1; index = nLen; /* ++index unreachable */ )
{
uno::Reference msforms::XShape xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape-getName( );
@@ -150,7 +150,7 @@ void SAL_CALL ScVbaShapeRange::setName( const
rtl::OUString _name ) throw (uno:
double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException)
{
sal_Int32 nLen = getCount();
-for ( sal_Int32 index = 1; index = nLen; ++index )
+for ( sal_Int32 index = 1; index = nLen; /* ++index unreachable */ )
{
uno::Reference msforms::XShape xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape-getHeight( );
@@ -171,7 +171,7 @@ void SAL_CALL ScVbaShapeRange::setHeight( double _height )
throw (uno::RuntimeEx
double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException)
{
sal_Int32 nLen = getCount();
-for ( sal_Int32 index = 1; index = nLen; ++index )
+for ( sal_Int32 index = 1; index = nLen; /* ++index unreachable */ )
{
uno::Reference msforms::XShape xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape-getWidth( );
@@ -192,7 +192,7 @@ void SAL_CALL ScVbaShapeRange::setWidth( double _width )
throw (uno::RuntimeExce
double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException)
{
sal_Int32 nLen = getCount();
-for ( sal_Int32 index = 1; index = nLen; ++index )
+for ( sal_Int32 index = 1; index = nLen; /* ++index unreachable */ )
{
uno::Reference msforms::XShape xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape-getLeft();
@@ -213,7 +213,7 @@ void SAL_CALL ScVbaShapeRange::setLeft( double _left )
throw (uno::RuntimeExcept
double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException)
{
sal_Int32 nLen = getCount();
-for ( sal_Int32 index = 1; index = nLen; ++index )
+for ( sal_Int32 index = 1; index = nLen; /* ++index unreachable */ )
{
uno::Reference msforms::XShape xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/NumberingManager.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ebcb781ab08019812088ea73ea90373bd61ff048
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Oct 7 16:10:01 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx
b/writerfilter/source/dmapper/NumberingManager.hxx
index d001805..e2953fb 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -111,7 +111,7 @@ public:
typedef boost::shared_ptr AbstractListDef Pointer;
AbstractListDef( );
-~AbstractListDef( );
+virtual ~AbstractListDef( );
// Setters using during the import
void SetId( sal_Int32 nId ) { m_nId = nId; };
@@ -145,7 +145,7 @@ public:
typedef boost::shared_ptr ListDef Pointer;
ListDef( );
-~ListDef( );
+virtual ~ListDef( );
// Accessors
void SetAbstractDefinition( AbstractListDef::Pointer pAbstract ) {
m_pAbstractDef = pAbstract; };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gtk3'
New branch 'feature/gtk3' available with the following commits: commit dbbef3de0a1ad57712a4753f0b0011517a810d68 Author: Michael Meeks michael.me...@suse.com Date: Fri Oct 7 12:41:35 2011 +0100 generic: start of sharing the PspGraphics code commit cf0bcab530bbb0ecef75341429bd197c3cfc8ee5 Author: Michael Meeks michael.me...@suse.com Date: Fri Oct 7 11:29:18 2011 +0100 WaE: cleanup misc. redundant warnings, and silence the gtk2 case commit 7e1c1c7d1eac26b6d4a923ea205731128fec0b66 Author: Michael Meeks michael.me...@suse.com Date: Fri Oct 7 10:43:17 2011 +0100 generic: remove mistaken m_aFrames hiding parent's frame list commit da7c88035b5007efba8a7deb2c7aebefff28df3f Author: Michael Meeks michael.me...@suse.com Date: Thu Oct 6 22:22:39 2011 +0100 gtk3: make AnyInput to behave itself properly commit 639f9fcca784e59a90218e8c9049a139130c179c Author: Michael Meeks michael.me...@suse.com Date: Mon Oct 3 20:06:35 2011 +0100 gtk3: fix gtk2 crash-on-exit regression commit 9240470b1951fb56aae4f714725b414f1866e6a7 Author: Michael Meeks michael.me...@suse.com Date: Mon Oct 3 20:00:17 2011 +0100 gtk3: try to improve AnyInput (absent toolkit support for it) commit 7a2f592d897783c729109a4ef8093b36c9f51ea2 Author: Michael Meeks michael.me...@suse.com Date: Mon Oct 3 16:36:26 2011 +0100 generic: re-work X error push/pop and error message handling commit efc367b95fc58a06bc0e4eb434a7273167ad9540 Author: Michael Meeks michael.me...@suse.com Date: Mon Oct 3 15:16:32 2011 +0100 generic: try to cleanup SalXLib cruft some more commit 03072a7c75a5b7ae4c0113e1cfed6fec48dd7e62 Author: Michael Meeks michael.me...@suse.com Date: Mon Oct 3 12:21:34 2011 +0100 generic: create shared display class and re-factor to use it commit 9a66bcead8746cdb7563331f5cfbb4706456fbd4 Author: Michael Meeks michael.me...@suse.com Date: Fri Sep 30 18:00:13 2011 +0100 move SalYieldMutexReleaser into a more sensible place commit 113a185be0e412236c762432768446a68fb2fd43 Author: Michael Meeks michael.me...@suse.com Date: Fri Sep 30 17:04:17 2011 +0100 generic: factor out generic display code, reducing cut+paste+bug commit 94cb10b142072416ee3bde9f8aaac12c0fb3369c Author: Michael Meeks michael.me...@suse.com Date: Fri Sep 30 15:46:24 2011 +0100 generic: share sal yield mutex properly commit 55a0a34cd8d0194bda78f1dd51b4e9944f0dd35d Author: Lucas Baudin xapa...@gmail.com Date: Thu Sep 29 19:47:01 2011 +0200 Gtk3 fixes, I tweaked the damage function to debug the rendering (the damage are is bigger to see a whole widget), if will need to be removed once we will fix that commit 72d63633fda2aa0763c5b81a99e4dcf85633efef Author: Lucas Baudin xapa...@gmail.com Date: Thu Sep 29 19:23:04 2011 +0200 Fix compilation in gtk3salnativewidgets commit 960e0a3ec0fba9bb53dec23d8021633570ce2272 Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 17:27:46 2011 +0100 misc cross-platform dependency / build issue redux commit a962ceceac32cc768b025bb8ff40a68cecc33865 Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 16:48:11 2011 +0100 remove redundant, legacy X library linkage into svp (thanks kendy) commit 9a3059fcde2fcf271e95e09a1284aefe2cb79d79 Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 16:14:34 2011 +0100 headless: move backend to top-level, and enable for all platforms commit ac76a1bdc775560d11807fe9ca84113c60094f00 Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 16:05:21 2011 +0100 gtk3: remove X dependency (for now) commit 022371c795101176bd4a3ab3c4000649fdd542de Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 14:45:58 2011 +0100 generic: merge me with last commit please ... - more work commit a1bb1f5a7b6090b840784425c9dc41ecb65d4945 Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 12:11:28 2011 +0100 generic: re-structure generic code to increase re-use between backends move more chunks of unx/generic into generic/ and into libvcl itself. This allows the headless backend to remove it's X linkage finally. commit af449ccaf59e944d61d3efc5014bee55933593ca Author: Michael Meeks michael.me...@suse.com Date: Thu Sep 29 11:37:24 2011 +0100 break headless coupling to X dependent backend commit ff7804ed88ff61d4eccafba1858662ae31d37cf4 Author: Michael Meeks michael.me...@suse.com Date: Wed Sep 28 18:09:40 2011 +0100 gtk3: substantial re-work and cleanup of event handling Implement SalTimer ourselves rather more cleanly Remove nasty GtkXLib cruft inherited from X backend Merge and cleanup most Yield / mainloop bits into GtkData commit a80ce3c411b04b53a93608b269356ac4f6f58287 Author: Michael Meeks michael.me...@novell.com Date: Fri Aug 26 17:59:46 2011 +0100 cleanup assertion commit 2c88db1b9c3f11e5b47e80271143bd623b75f57a Author: Lucas Baudin xapa...@gmail.com Date: Wed Aug 17 14:55:00 2011 +0100
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/ppdparser.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a99322071afd45c17df973a965e459111c93f36b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 7 14:47:02 2011 +0100
its not a secret which PPD is missing a DefaultResolution
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 8b99f1a..a236e5f 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -824,7 +824,9 @@ PPDParser::PPDParser( const String rFile ) :
if( m_pResolutions )
m_pDefaultResolution = m_pResolutions-getDefaultValue();
DBG_ASSERT( m_pResolutions, Warning: no Resolution in PPD\n );
-DBG_ASSERT( m_pDefaultResolution, Warning: no DefaultResolution in PPD\n
);
+DBG_ASSERT( m_pDefaultResolution,
+rtl::OStringBuffer(Warning: no DefaultResolution in ).
+append(rtl::OUStringToOString(rFile,
osl_getThreadTextEncoding())).append('\n').getStr() );
m_pInputSlots = getKey( String( RTL_CONSTASCII_USTRINGPARAM( InputSlot )
) );
if( m_pInputSlots )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bean/native cui/source dbaccess/source desktop/source desktop/win32 sw/source
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 25 --
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |9 ---
cui/source/options/optgdlg.cxx|2
dbaccess/source/ui/dlg/odbcconfig.cxx |1
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx|2
desktop/win32/source/extendloaderenvironment.cxx |2
desktop/win32/source/guistdio/guistdio.inc| 25 --
desktop/win32/source/setup/setup.cpp |2
sw/source/ui/vba/vbasystem.cxx|4 -
9 files changed, 16 insertions(+), 56 deletions(-)
New commits:
commit 9142f9a1a10f2df24f55e21b9203058bd0d2626a
Author: Michael Meeks michael.me...@novell.com
Date: Mon Sep 26 09:47:21 2011 +0100
WaE: win32 cleanup
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index eba6076..8954d05 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
@@ -36,22 +36,7 @@
#include jawt.h
-#if defined assert
-#undef assert
-#endif
-
-#define assert(X) if (!X) { (*env)-ThrowNew(env, (*env)-FindClass(env,
java/lang/RuntimeException), assertion failed); return 0L;}
-
-
#define SYSTEM_WIN32 1
-#define SYSTEM_WIN16 2
-#define SYSTEM_JAVA3
-#define SYSTEM_MAC 5
-#define SYSTEM_XWINDOW 6
-
-#define OLD_PROC_KEY oldwindowproc
-
-static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM );
JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
(JNIEnv * env, jobject obj_this);
@@ -70,7 +55,6 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
return (SYSTEM_WIN32);
}
-
/*/
/*
* Class: com_sun_star_beans_LocalOfficeWindow
@@ -83,13 +67,4 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindo
return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow(
env, obj_this );
}
-
-
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 65078c8..7ad1126 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -66,17 +66,11 @@ extern __declspec(dllimport) unsigned char __stdcall
JAWT_GetAWT(JNIEnv *, JAWT
#endif
#define SYSTEM_WIN32 1
-#define SYSTEM_WIN16 2
-#define SYSTEM_JAVA3
-#define SYSTEM_MAC 5
-#define SYSTEM_XWINDOW 6
#define OLD_PROC_KEY oldwindowproc
static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM );
-
-
/* type must be something like java/lang/RuntimeException
*/
static void ThrowException(JNIEnv * env, char const * type, char const * msg) {
@@ -126,7 +120,6 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
JAWT_DrawingSurface* ds;
JAWT_DrawingSurfaceInfo* dsi;
JAWT_Win32DrawingSurfaceInfo* dsi_win;
-HDC hdc;
HWND hWnd;
LONG hFuncPtr;
@@ -152,8 +145,6 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
/* Get the platform-specific drawing info */
dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi-platformInfo;
-hdc = dsi_win-hdc;
-
hWnd = dsi_win-hwnd;
/* Free the drawing surface info */
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index eebe5f4..e08dcc7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -820,7 +820,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const
SfxItemSet rSet ) :
DELETEZ( pFontAntiAliasing );
Point aPos;
-for ( sal_Int32 i = 0; i SAL_N_ELEMENTS( pMiscOptions ); ++i )
+for ( size_t i = 0; i SAL_N_ELEMENTS( pMiscOptions ); ++i )
{
aPos = pMiscOptions[i]-GetPosPixel( );
aPos.Y() -= nMoveUp;
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx
b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 858bf0a..c01f82b 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -67,6 +67,7 @@
// just to go with calling convention of windows
// so don't touch this
#if defined(WNT)
+#undef SQL_API
#define SQL_API __stdcall
// At least under some circumstances, the below #include odbc/sqlext.h re-
// defines SQL_API to an empty string, leading to a compiler warning on MSC; to
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index a5e0daf..7d60301 100644
---
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/LinkTarget.mk | 29 +++-- 1 file changed, 7 insertions(+), 22 deletions(-) New commits: commit 6055a5df7b6e7452987a9584d10f436ca2d349fd Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Oct 7 16:40:22 2011 +0200 no more gbuild loops: break early on nonexistent objects (this commit breaks multi-repo support) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3b5356c..44eae00 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -132,9 +132,6 @@ endef $(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo -$(call gb_CObject_get_dep_target,%) : - $(eval $(call gb_Output_error,Unable to find plain C file $(call gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS))) - gb_CObject_CObject = @@ -190,12 +187,6 @@ endef $(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call gb_CxxObject__rules,$(repo -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_CxxObject_get_dep_target,%) : - $(eval $(call gb_Output_error,Unable to find C++ file $(call gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS))) - -endif - gb_CxxObject_CxxObject = @@ -280,11 +271,6 @@ endef $(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call gb_ObjCxxObject__rules,$(repo -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_ObjCxxObject_get_dep_target,%) : - $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS))) -endif - gb_ObjCxxObject_ObjCxxObject = # ObjCObject class @@ -320,11 +306,6 @@ endef $(foreach repo,$(gb_ObjCObject_REPOS),$(eval $(call gb_ObjCObject__rules,$(repo -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_ObjCObject_get_dep_target,%) : - $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCObject_get_source,,$*) in repositories: $(gb_ObjCObject_REPOS))) -endif - gb_ObjCObject_ObjCObject = @@ -351,9 +332,6 @@ endef $(foreach repo,$(gb_AsmObject_REPOS),$(eval $(call gb_AsmObject__rules,$(repo -$(call gb_AsmObject_get_dep_target,%) : - $(eval $(call gb_Output_error,Unable to find asm file $(call gb_AsmObject_get_source,,$*) in the repositories: $(gb_AsmObject_REPOS))) - gb_AsmObject_AsmObject = @@ -773,6 +751,7 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : $$(foreach lib,$(2),$$( endef define gb_LinkTarget_add_cobject +$(if $(wildcard $(call gb_CObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_CObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : COBJECTS += $(2) @@ -793,6 +772,7 @@ endif endef define gb_LinkTarget_add_cxxobject +$(if $(wildcard $(call gb_CxxObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_CxxObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2) @@ -813,6 +793,7 @@ endif endef define gb_LinkTarget_add_objcobject +$(if $(wildcard $(call gb_ObjCObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_ObjCObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : OBJCOBJECTS += $(2) @@ -833,6 +814,7 @@ endif endef define gb_LinkTarget_add_objcxxobject +$(if $(wildcard $(call gb_ObjCxxObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_ObjCxxObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : OBJCXXOBJECTS += $(2) @@ -853,6 +835,7 @@ endif endef define gb_LinkTarget_add_asmobject +$(if $(wildcard $(call gb_AsmObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_AsmObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : ASMOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : ASMOBJECTS += $(2) @@ -872,6 +855,7 @@ endif endef define gb_LinkTarget_add_generated_c_object +$(if $(wildcard $(call gb_GenCObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_GenCObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2) @@ -892,6 +876,7 @@ endif endef define gb_LinkTarget_add_generated_cxx_object +$(if $(wildcard $(call gb_GenCxxObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_GenCxxObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) $(call
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/cmdid.h |1
sw/inc/editsh.hxx | 17 +++-
sw/source/core/edit/edatmisc.cxx| 31 +--
sw/source/core/edit/edattr.cxx | 48 +---
sw/source/core/edit/editsh.cxx |4 +--
sw/source/core/edit/ednumber.cxx| 19 +++---
sw/source/ui/docvw/PageBreakWin.cxx | 34 +++--
sw/source/ui/inc/uiitems.hxx| 16
sw/source/ui/inc/wrtsh.hxx |2 -
sw/source/ui/shells/textsh1.cxx | 41 +-
sw/source/ui/utlui/uiitems.cxx | 25 ++
sw/source/ui/wrtsh/wrtsh1.cxx |9 +++---
12 files changed, 167 insertions(+), 80 deletions(-)
New commits:
commit eb0e2fcf15ed37f56c2334d292bdc1fb054bc287
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Oct 7 16:55:03 2011 +0200
Page Break: Fixed part of the Edit menu action cursors handling
Added an optional SwPaM argument to SID_PARA_DLG action to avoid
changing the current cursor before showing the dialog.
Set the focus to SwEditWin after the action to continue editing the
document.
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 97f6e10..fae2a95 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -1137,6 +1137,7 @@ included in c-context files, so c++ style stuff will
cause problems.
#define FN_SHAPE_POSITION_LAYOUT_DIR(FN_PARAM2+24)
#define FN_SHAPE_STARTPOSITION_IN_HORI_L2R (FN_PARAM2+25)
#define FN_SHAPE_ENDPOSITION_IN_HORI_L2R (FN_PARAM2+26)
+#define FN_PARAM_PAM(FN_PARAM2+27) /* Point and Mark */
/*
Bereich: Druckoptionen
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d1e423f..f821dca 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -247,10 +247,12 @@ public:
// the requested item set as a LR-SPACE item, if corresponding node has not
// its own indent attributes and the position-and-space mode of the list
// level is SvxNumberFormat::LABEL_ALIGNMENT.
+sal_Bool GetPaMAttr( SwPaM* pPaM, SfxItemSet ,
+ const bool bMergeIndentValuesOfNumRule = false ) const;
sal_Bool GetCurAttr( SfxItemSet ,
const bool bMergeIndentValuesOfNumRule = false ) const;
void SetAttr( const SfxPoolItem, sal_uInt16 nFlags = 0 );
-void SetAttr( const SfxItemSet, sal_uInt16 nFlags = 0 );
+void SetAttr( const SfxItemSet, sal_uInt16 nFlags = 0, SwPaM* pCrsr =
NULL );
// Set attribute as new default attribute in document.
void SetDefault( const SfxPoolItem );
@@ -258,7 +260,7 @@ public:
// Query default attribute of document.
const SfxPoolItem GetDefault( sal_uInt16 nFmtHint ) const;
-void ResetAttr( const std::setsal_uInt16 attrs = std::setsal_uInt16()
);
+void ResetAttr( const std::setsal_uInt16 attrs =
std::setsal_uInt16(), SwPaM* pCrsr = NULL );
void GCAttr();
// Returns the scripttpye of the selection.
@@ -296,6 +298,7 @@ public:
sal_uInt16 GetTxtFmtCollCount() const;
SwTxtFmtColl GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
SwTxtFmtColl* GetCurTxtFmtColl() const;
+SwTxtFmtColl* GetPaMTxtFmtColl( SwPaM* pPaM ) const;
// #i62675#
// Add 2nd optional parameter bResetListAttrs - see also
SwDoc::SetTxtFmtColl(..)
@@ -489,11 +492,11 @@ public:
void ChgNumRuleFmts( const SwNumRule rRule );
// Set (and query if) a numbering with StartFlag starts at current
PointPos.
-void SetNumRuleStart( sal_Bool bFlag = sal_True );
-sal_Bool IsNumRuleStart() const;
-void SetNodeNumStart( sal_uInt16 nStt );
+void SetNumRuleStart( sal_Bool bFlag = sal_True, SwPaM* pCrsr = NULL );
+sal_Bool IsNumRuleStart( SwPaM* pPaM = NULL ) const;
+void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = NULL );
-sal_uInt16 GetNodeNumStart() const;
+sal_uInt16 GetNodeNumStart( SwPaM* pPaM = NULL ) const;
sal_Bool ReplaceNumRule( const String rOldRule, const String rNewRule );
@@ -760,7 +763,7 @@ public:
sal_uInt16 GetINetAttrs( SwGetINetAttrs rArr );
String GetDropTxt( const sal_uInt16 nChars ) const;
-void ReplaceDropTxt( const String rStr );
+void ReplaceDropTxt( const String rStr, SwPaM* pPaM = NULL );
// May an outline be moved or copied?
// Check whether it's in text body, not in table, and not read-only (move).
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index c4ba463..6754314 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -44,20 +44,22 @@
*/
-void SwEditShell::ResetAttr( const std::setsal_uInt16 attrs )
+void SwEditShell::ResetAttr( const std::setsal_uInt16 attrs, SwPaM* pPaM )
{
SET_CURR_SHELL( this );
+SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( );
+
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/windows.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 084e181b6ccdafed1acafa11ab75335703eb0b40 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Oct 7 16:57:06 2011 +0300 WaE: Disable also warning C4373 previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index d9ffbf7..2adcfbf 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -123,6 +123,7 @@ gb_CFLAGS := \ -wd4692 \ -wd4710 \ -wd4711 \ + -wd4373 \ -wd4738 \ -wd4786 \ -wd4800 \ @@ -174,6 +175,7 @@ gb_CXXFLAGS := \ -wd4692 \ -wd4710 \ -wd4711 \ + -wd4373 \ -wd4738 \ -wd4786 \ -wd4800 \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gtk3' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/generic vcl/headless vcl/inc vcl/win
vcl/generic/print/genprnpsp.cxx | 31 -
vcl/generic/print/genpspgraphics.cxx | 32 ++
vcl/generic/print/glyphset.cxx |6 +
vcl/generic/print/printerjob.cxx | 42 +++
vcl/headless/svpgdi.cxx |6 -
vcl/inc/vcl/sysdata.hxx | 31 +
vcl/win/source/gdi/salgdi3.cxx |8 --
7 files changed, 95 insertions(+), 61 deletions(-)
New commits:
commit 212534810d168558bb1039b8421744b9efeaa2bd
Author: Michael Meeks michael.me...@suse.com
Date: Fri Oct 7 17:29:49 2011 +0100
generic: more unix conditional compilation pieces and win32 porting
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 9783652..9e5e2c6 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -41,9 +41,12 @@
printer job functions.
*/
-#include unistd.h
-#include sys/wait.h
-#include sys/stat.h
+// For spawning PDF and FAX generation
+#if defined( UNX )
+# include unistd.h
+# include sys/wait.h
+# include sys/stat.h
+#endif
#include rtl/ustring.hxx
@@ -106,6 +109,7 @@ static String getPdfDir( const PrinterInfo rInfo )
static void getPaLib()
{
+#if defined( UNX )
if( ! driverLib )
{
OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) );
@@ -123,6 +127,7 @@ static void getPaLib()
if ( !pFaxNrFunction )
fprintf( stderr, could not resolve Sal_queryFaxNumber\n );
}
+#endif
}
inline int PtTo10Mu( int nPoints ) { return
(int)double)nPoints)*35.2778)+0.5); }
@@ -225,6 +230,8 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
}
}
+// Needs a cleaner abstraction ...
+#if defined( UNX )
static bool passFileToCommandLine( const String rFilename, const String
rCommandLine, bool bRemoveFile = true )
{
bool bSuccess = false;
@@ -308,9 +315,11 @@ static bool passFileToCommandLine( const String
rFilename, const String rComma
return bSuccess;
}
+#endif
static bool sendAFax( const String rFaxNumber, const String rFileName, const
String rCommand )
{
+#if defined( UNX )
std::list OUString aFaxNumbers;
if( ! rFaxNumber.Len() )
@@ -368,14 +377,23 @@ static bool sendAFax( const String rFaxNumber, const
String rFileName, const S
unlink( ByteString( rFileName, osl_getThreadTextEncoding() ).GetBuffer() );
return bSuccess;
+#else
+(void)rFaxNumber; (void)rFileName; (void)rCommand;
+return false;
+#endif
}
static bool createPdf( const String rToFile, const String rFromFile, const
String rCommandLine )
{
+#if defined( UNX )
String aCommandLine( rCommandLine );
while( aCommandLine.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM(
(OUTFILE) ) ), rToFile ) != STRING_NOTFOUND )
;
return passFileToCommandLine( rFromFile, aCommandLine );
+#else
+(void)rToFile; (void)rFromFile; (void)rCommandLine;
+return false;
+#endif
}
/*
@@ -929,10 +947,11 @@ sal_Bool PspSalPrinter::StartJob(
m_aJobData.setCollate( bCollate );
}
-// check wether this printer is configured as fax
int nMode = 0;
-const PrinterInfo rInfo( PrinterInfoManager::get().getPrinterInfo(
m_aJobData.m_aPrinterName ) );
+#if defined( UNX )
+// check whether this printer is configured as fax
sal_Int32 nIndex = 0;
+const PrinterInfo rInfo( PrinterInfoManager::get().getPrinterInfo(
m_aJobData.m_aPrinterName ) );
while( nIndex != -1 )
{
OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
@@ -968,6 +987,7 @@ sal_Bool PspSalPrinter::StartJob(
break;
}
}
+#endif
m_aPrinterGfx.Init( m_aJobData );
// set/clear backwards compatibility flag
@@ -999,7 +1019,6 @@ sal_Bool PspSalPrinter::EndJob()
// check for fax
if( m_bFax )
{
-
const PrinterInfo rInfo(
PrinterInfoManager::get().getPrinterInfo( m_aJobData.m_aPrinterName ) );
// sendAFax removes the file after use
bSuccess = sendAFax( m_aFaxNr, m_aTmpFile, rInfo.m_aCommand );
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index b9b82a0..823d46a 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -1317,27 +1317,15 @@ bool GenPspGraphics::drawAlphaRect( long, long, long,
long, sal_uInt8 )
SystemGraphicsData GenPspGraphics::GetGraphicsData() const
{
-SystemGraphicsData aRes;
-aRes.nSize = sizeof(aRes);
-aRes.hDrawable = 0;
-aRes.pXRenderFormat = 0;
-return aRes;
+return SystemGraphicsData();
}
SystemFontData GenPspGraphics::GetSysFontData( int nFallbacklevel ) const
{
-SystemFontData aSysFontData;
-
if (nFallbacklevel = MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
if
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/LinkTarget.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 49861a0246547554e285b4d14f049a28addd4ddc Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Oct 7 19:05:48 2011 +0200 error on missing generated files too diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 78375bf..dea4aaa 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -197,6 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c # gb_CObject__command $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%) + $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file $))) $(call gb_CObject__command,$@,$*,$,$(call gb_GenCObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) @@ -215,6 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx # gb_CxxObject__command $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%) + $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file $))) $(call gb_CxxObject__command,$@,$*,$,$(call gb_GenCxxObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/salatsuifontutils.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 78b1cc1a08d712212152a1e57400c8b07654e471
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Fri Oct 7 20:40:01 2011 +0200
Revert cppcheck scope reduction in vcl/..salatsuifontutils.cxx
This reverts commit e45b962f49829d5c60c913383b2132b579af3fab.
this is the most probale cause of the breakage on MacOSX tinderbox.
Do not really understand why it should break, but I do not see other
potential guilty commits... No MacOSX at hand... so revert and see
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx
b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index d9d2c8e..e124b3c 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -237,6 +237,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID,
ImplDevFontAttributes rDF
return false;
int nBestNameValue = 0;
int nBestStyleValue = 0;
+FontLanguageCode eBestLangCode = 0;
const FontLanguageCode eUILangCode =
Application::GetSettings().GetUILanguage();
typedef std::vectorchar NameBuffer;
NameBuffer aNameBuffer( 256 );
@@ -332,7 +333,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID,
ImplDevFontAttributes rDF
{
// get the best family name
nBestNameValue = nNameValue;
-FontLanguageCode eBestLangCode = eFontNameLanguage;
+eBestLangCode = eFontNameLanguage;
rDFA.maName = aUtf16Name;
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/accfixes2'
New branch 'feature/accfixes2' available with the following commits: commit c6f8b749669589a2e645364033ea8882105ccf2d Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 14:22:00 2011 -0500 accfixes2: fixes compiler issues commit fbcf97ac797b3d075928bea4c424ab2b7c6ac6d8 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 14:18:30 2011 -0500 accfixes2: bugfix commit 76e01b0b310b6a4bb0bef9f838ac515a2991ff19 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 14:16:43 2011 -0500 accfixes2: no selection event for tab control itself, tap page will notify commit 0338874f3cc719a6265a497c357ef41bf9f1cf41 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 14:14:49 2011 -0500 accfixes2: scrollsbar's accessible name are horizontal/vertical scroll bar commit 07e6f0abaaf4b4c2566868b6cf5c9c13dc488686 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 14:07:11 2011 -0500 accfixes2: scroll bar shouldn't have the state focusable commit 2e7c0a6e2b8962d41b292ac25e81c2e6ae56a726 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 14:05:48 2011 -0500 accfixes2: radio buttons accessible action description is select, not click commit 3bc617a0af5be2ef7ed290be4c4a3ae9bbfd53a4 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:52:33 2011 -0500 accfixes2: accessible edit: removed implmenetation for accessible role password role handled in window::getaccessiblerole meanwhile commit 7041eb2dd5257eff945fab64e57677ec07fc0029 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:49:49 2011 -0500 accfixes2: accessible fix check box returns it returns depending on current state, action check or uncheck, instead of click commit 18f9397f2411e4144f2beb5bc10bda84b10bd191 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:41:25 2011 -0500 If the button has a poppup menu,it should has the state EXPANDABLE commit 044c1043c05f4acba031ddb90ba1a4890b31ae9a Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:38:19 2011 -0500 accfixes: add SvxTPFilter::SetAccessibleRelationMemberOf commit 79a1c219d96a197c72d7759157dbf6e765f7655e Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:31:10 2011 -0500 defensive code against deferencing NULL pointers commit c1dffc20499a872f9eb4fc9adfb098475ad3a2d5 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:26:19 2011 -0500 accfixes2: minor changes commit 4e8e8a70ec8bcd0883d1b58467151e95b87929f1 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:19:02 2011 -0500 accfixes2: add bullet char only if GetNumberingType is SVX_NUM_CHAR_SPECIAL commit ce45b2086fe422a4ae48ea0d96d0cc6286022015 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:09:10 2011 -0500 accfixes2: GetText for bullet changed commit 0f104e0b4ecf0431e7e9a30751104a5d256cf444 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 13:06:50 2011 -0500 accfixes2: Accessibility enhancements for svtools tree lists commit 86549116e2edace920a78bd8e5aa9fc1604a1b84 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 01:01:40 2011 -0500 accfixes2: deliver accessibility API implementation for the ruler commit e1d5adb5c5ff5505aa95a3e2219192354774b514 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 00:58:39 2011 -0500 accfixes2: Some changes in BrowseBox::GetAccessibleObjectName commit c1d9cbee958a0c39679cd581e6fa66fc68ed2a5d Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 00:42:08 2011 -0500 accfixes2: TextEngine::GetTextColor commit d78255779d68e911a7b53ce570a1a28944d39904 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 00:37:31 2011 -0500 accfixes2: accessibility improvements for ValueSets commit 6d217a7c13b30ec5f32707d6022e45eb906a6cfc Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 5 00:14:07 2011 -0500 accfixes2: accessibility API implementation for the headerbar commit 3ddb5807d67c12e8ea8c9e22409f639eb6d6dfa8 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 4 21:37:06 2011 -0500 accfixes2: accessibility API implementation for the ruler commit 4e1d737466d0e5474184baf06709a8f14b56ae68 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 4 20:02:51 2011 -0500 accfixes2: EmbeddedObjectRef::GetChartType() commit 87225f56fcd7f18c340e1da32209721a48588a8a Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 4 19:26:22 2011 -0500 accfixes2: MultiLineEdit: Avoid some focus events in certain windows commit e7b59cd7101b1077c5087430ff69a650c6bdd556 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 4 19:26:15 2011 -0500 accfixes2: new relation: DESCRIBED_BY commit 189b48e8d9dee6c23977251c346f5d8d041a5781 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 4 19:20:18 2011 -0500 accfixes2: some role string
[Libreoffice-commits] .: 2 commits - configmgr/source desktop/scripts desktop/source framework/source offapi/com officecfg/registry postprocess/packregistry scp2/source setup_native/source test/user-t
configmgr/source/components.cxx | 24 -- desktop/scripts/unopkg.sh| 2 desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2 framework/source/accelerators/presethandler.cxx | 50 +++-- framework/source/services/substitutepathvars.cxx | 18 +- offapi/com/sun/star/util/PathSubstitution.idl| 6 officecfg/registry/data/org/openoffice/Office/Impress.xcu| 2 officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 4 postprocess/packregistry/makefile.mk | 3 scp2/source/base/file_base.scp | 2 scp2/source/binfilter/file_binfilter.scp | 2 scp2/source/calc/file_calc.scp | 2 scp2/source/draw/file_draw.scp | 2 scp2/source/gnome/file_gnome.scp | 2 scp2/source/graphicfilter/file_graphicfilter.scp | 2 scp2/source/impress/file_impress.scp | 2 scp2/source/impress/module_ogltrans.scp | 2 scp2/source/javafilter/file_javafilter.scp | 6 scp2/source/layout/layout.scp| 2 scp2/source/math/file_math.scp | 2 scp2/source/onlineupdate/file_onlineupdate.scp | 2 scp2/source/ooo/directory_ooo.scp| 90 +++--- scp2/source/ooo/file_extra_ooo.scp | 4 scp2/source/ooo/file_ooo.scp | 28 +-- scp2/source/python/file_python.scp | 2 scp2/source/writer/file_writer.scp | 2 scp2/source/xsltfilter/file_xsltfilter.scp | 2 setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions | 6 test/user-template/user/registry/main.xcd| 4 tools/inc/tools/diagnose_ex.h| 15 + vcl/aqua/source/gdi/salgdi.cxx | 16 - vcl/ios/source/gdi/salgdi.cxx| 18 -- vcl/source/gdi/impimagetree.cxx | 4 xmlhelp/source/cxxhelp/provider/provider.cxx | 2 34 files changed, 150 insertions(+), 182 deletions(-) New commits: commit 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Oct 7 21:12:30 2011 +0200 Undo basis/brand split: merge basis share/ into brand share/. diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 4887928..650df69 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -529,32 +529,22 @@ Components::Components( 0, expand( rtl::OUString( -RTL_CONSTASCII_USTRINGPARAM($OOO_BASE_DIR/share/registry; +RTL_CONSTASCII_USTRINGPARAM( +$BRAND_BASE_DIR/share/registry; parseModuleLayer( 2, expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( -$OOO_BASE_DIR/share/registry/modules; +$BRAND_BASE_DIR/share/registry/modules; parseResLayer( 3, expand( rtl::OUString( -RTL_CONSTASCII_USTRINGPARAM($OOO_BASE_DIR/share/registry; -parseXcsXcuLayer( -4, -expand( -rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( $BRAND_BASE_DIR/share/registry; -parseModuleLayer( -6, -expand( -rtl::OUString( -RTL_CONSTASCII_USTRINGPARAM( -$BRAND_BASE_DIR/share/registry/modules; parseXcsXcuIniLayer( -7, +4, expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -564,7 +554,7 @@ Components::Components( PackageRegistryBackend/configmgr.ini))), false); parseXcsXcuIniLayer( -9, +6, expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -574,7 +564,7 @@ Components::Components(
[Libreoffice-commits] .: bootstrap bootstrap.1 configure.in .gitignore set_soenv.in
.gitignore |1
bootstrap| 89 +++
bootstrap.1 | 88 --
configure.in |1
set_soenv.in | 17 ---
5 files changed, 89 insertions(+), 107 deletions(-)
New commits:
commit aa09a9b77d10145ecc0dc0111c7235d869a428a8
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Oct 7 14:10:10 2011 -0500
bootstrap.1 is not usefull anymore use bootsrap directly
diff --git a/.gitignore b/.gitignore
index 8c0f62a..57cd362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,6 @@
/aclocal.m4
/autom4te.cache
/autogen.lastrun
-/bootstrap
/ChangeLog
/config.guess
/config.log
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 000..1bf5068
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+if test -z ${SOLARENV}; then
+if test -f ./Env.Build.sh ; then
+. ./Env.Build.sh
+else
+if test -f ./Env.Host.sh ; then
+. ./Env.Host.sh
+fi
+fi
+fi
+if test -z ${SOLARENV}; then
+echo bootstrap: No environment set!
+exit 1
+fi
+
+# remove aliases set by Env.Host.sh
+unalias mkout2 /dev/null
+unalias deliver 2 /dev/null
+unalias build2 /dev/null
+unalias zipdep 2 /dev/null
+
+# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
+# Use spawn instead of fork when building dmake on cygwin.
+if test $GUI_FOR_BUILD = WNT; then
+EXEEXT=.exe
+DMAKE_CONF=--enable-spawn
+else
+EXEEXT=
+DMAKE_CONF=
+fi
+export EXEEXT
+
+#
--
+# Build dmake
+
+if test $BUILD_DMAKE != NO; then
+if test ! -x $SRC_ROOT/dmake/dmake$EXEEXT; then
+cd $SRC_ROOT/dmake || exit
+
+# If cross-compiling then don't use the cross compilers to build dmake.
+if test $GUI_FOR_BUILD = WNT; then
+# Let the Cygwin gcc be found
+unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+elif test $CROSS_COMPILING = YES; then
+export CC=$CC_FOR_BUILD
+export CXX=$CXX_FOR_BUILD
+unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+fi
+
+# For normal unixy systems
+if test -f Makefile ; then
+$GNUMAKE distclean || exit
+fi
+
+./configure $DMAKE_CONF || exit
+
+## invoke the gnu make command set by configure.
+$GNUMAKE || exit
+
+echo
+echo dmake has been successfully built
+
+cd ..
+else
+echo dmake/dmake already built
+fi
+fi
+
+mkdir -p $SOLARENV/$OUTPATH_FOR_BUILD/bin
+if test $BUILD_DMAKE != NO; then
+cp -f $SRC_ROOT/dmake/dmake$EXEEXT $SOLARENV/$OUTPATH_FOR_BUILD/bin ||
exit
+echo
+echo dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT
+fi
+
+#make sure build.pl is executable
+
+chmod +x $SRC_ROOT/solenv/bin/build.pl
+chmod +x $SRC_ROOT/solenv/bin/zipdep.pl
+chmod +x $SRC_ROOT/solenv/bin/gccinstlib.pl
+
+# Local Variables:
+# mode: shell-script
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bootstrap.1 b/bootstrap.1
deleted file mode 100755
index 933b2db..000
--- a/bootstrap.1
+++ /dev/null
@@ -1,88 +0,0 @@
-
-if test -z ${SOLARENV}; then
-if test -f ./Env.Build.sh ; then
-. ./Env.Build.sh
-else
-if test -f ./Env.Host.sh ; then
-. ./Env.Host.sh
-fi
-fi
-fi
-if test -z ${SOLARENV}; then
-echo bootstrap: No environment set!
-exit 1
-fi
-
-# remove aliases set by Env.Host.sh
-unalias mkout2 /dev/null
-unalias deliver 2 /dev/null
-unalias build2 /dev/null
-unalias zipdep 2 /dev/null
-
-# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
-# Use spawn instead of fork when building dmake on cygwin.
-if test $GUI_FOR_BUILD = WNT; then
-EXEEXT=.exe
-DMAKE_CONF=--enable-spawn
-else
-EXEEXT=
-DMAKE_CONF=
-fi
-export EXEEXT
-
-#
--
-# Build dmake
-
-if test $BUILD_DMAKE != NO; then
-if test ! -x $SRC_ROOT/dmake/dmake$EXEEXT; then
-cd $SRC_ROOT/dmake || exit
-
-# If cross-compiling then don't use the cross compilers to build dmake.
-if test $GUI_FOR_BUILD = WNT; then
-# Let the Cygwin gcc be found
-unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-elif test $CROSS_COMPILING = YES; then
-export CC=$CC_FOR_BUILD
-export CXX=$CXX_FOR_BUILD
-unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-fi
-
-# For normal unixy systems
-if test -f Makefile ; then
-$GNUMAKE distclean || exit
-fi
-
-./configure $DMAKE_CONF || exit
-
-## invoke the gnu make command set by configure.
-$GNUMAKE || exit
-
-echo
-echo dmake
[Libreoffice-commits] .: Branch 'feature/scripting_gbuild' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/filters-test.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fed75d001e6a48a84bc46606848af3ba0219df29 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Oct 7 23:32:09 2011 +0200 set the correct url for vba unit test it seems like the method name is the same as the module name unit test still crashs because it can't find XSpreadsheetView but works in general diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 3e80c37..4a56ce1 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -618,7 +618,7 @@ void ScFiltersTest::testVba() //it seems that the basic ide does it differently, but then we would need to init all parts ourself //the problem is that CallXScript inits the basic part BasicIDE::RunMethod takes an SbMethod as parametre -rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.Modul1.macro1?language=Basiclocation=document)); +rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basiclocation=document)); String sUrl = aURL; Any aRet; Sequence sal_Int16 aOutParamIndex; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/filters-test.cxx | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 72d87e2b5f37c639c04a1da80b922ae38537d591
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Oct 8 01:37:18 2011 +0200
improve error messages for sc's filters-test
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 4a56ce1..525a917 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -102,7 +102,9 @@ void testFile(rtl::OUString aFileName, ScDocument* pDoc,
SCTAB nTab, StringType
catch (const orcus::csv_parse_error e)
{
std::cout reading csv content file failed: e.what()
std::endl;
-CPPUNIT_ASSERT_MESSAGE(csv parser error, false);
+rtl::OStringBuffer aErrorMsg(csv parser error: );
+aErrorMsg.append(e.what());
+CPPUNIT_ASSERT_MESSAGE(aErrorMsg.getStr(), false);
}
}
@@ -124,7 +126,9 @@ void testCondFile(rtl::OUString aFileName, ScDocument*
pDoc, SCTAB nTab)
catch (const orcus::csv_parse_error e)
{
std::cout reading csv content file failed: e.what()
std::endl;
-CPPUNIT_ASSERT_MESSAGE(csv parser error, false);
+rtl::OStringBuffer aErrorMsg(csv parser error: );
+aErrorMsg.append(e.what());
+CPPUNIT_ASSERT_MESSAGE(aErrorMsg.getStr(), false);
}
}
@@ -153,7 +157,7 @@ public:
*/
void testCVEs();
-//ods filter tests
+//ods, xls, xlsx filter tests
void testRangeName();
void testContent();
void testFunctions();
@@ -597,7 +601,7 @@ void ScFiltersTest::testStarBasic()
double aValue;
pDoc-GetValue(0,0,0,aValue);
std::cout aValue std::endl;
-CPPUNIT_ASSERT_MESSAGE(,aValue==2);
+CPPUNIT_ASSERT_MESSAGE(script did not change the value of
Sheet1.A1,aValue==2);
xDocSh-DoClose();
}
@@ -630,7 +634,7 @@ void ScFiltersTest::testVba()
double aValue;
pDoc-GetValue(0,0,0,aValue);
std::cout aValue std::endl;
-CPPUNIT_ASSERT_MESSAGE(,aValue==2);
+CPPUNIT_ASSERT_MESSAGE(script did not change the value of
Sheet1.A1,aValue==2);
xDocSh-DoClose();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
