Re: License statement fro LibreOffice
To whom it may concern, All of my past and future contributions made to the LibreOffice project are done under MPL1.1+/GPLv3+/LGPLv3+. Joseph Powers ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: embeddedobj/inc embeddedobj/source embeddedobj/test
embeddedobj/inc/pch/precompiled_embeddedobj.cxx | 31 - embeddedobj/inc/pch/precompiled_embeddedobj.hxx | 34 --- embeddedobj/source/commonembedding/embedobj.cxx |2 - embeddedobj/source/commonembedding/inplaceobj.cxx|2 - embeddedobj/source/commonembedding/miscobj.cxx |3 - embeddedobj/source/commonembedding/persistence.cxx |3 - embeddedobj/source/commonembedding/register.cxx |4 -- embeddedobj/source/commonembedding/specialobject.cxx |2 - embeddedobj/source/commonembedding/visobj.cxx|2 - embeddedobj/source/commonembedding/xfactory.cxx |2 - embeddedobj/source/general/docholder.cxx |2 - embeddedobj/source/general/dummyobject.cxx |1 embeddedobj/source/general/intercept.cxx |3 - embeddedobj/source/general/xcreator.cxx |2 - embeddedobj/source/msole/advisesink.cxx |3 - embeddedobj/source/msole/closepreventer.cxx |3 - embeddedobj/source/msole/graphconvert.cxx|2 - embeddedobj/source/msole/olecomponent.cxx|2 - embeddedobj/source/msole/oleembed.cxx|3 - embeddedobj/source/msole/olemisc.cxx |2 - embeddedobj/source/msole/olepersist.cxx |3 - embeddedobj/source/msole/oleregister.cxx |4 -- embeddedobj/source/msole/olevisual.cxx |2 - embeddedobj/source/msole/olewrapclient.cxx |3 - embeddedobj/source/msole/ownview.cxx |2 - embeddedobj/source/msole/xdialogcreator.cxx |3 - embeddedobj/source/msole/xolefactory.cxx |2 - embeddedobj/test/MainThreadExecutor/register.cxx |4 -- embeddedobj/test/MainThreadExecutor/xexecutor.cxx|3 - embeddedobj/test/mtexecutor/bitmapcreator.cxx|3 - embeddedobj/test/mtexecutor/mainthreadexecutor.cxx |3 - embeddedobj/test/mtexecutor/mteregister.cxx |4 -- 32 files changed, 144 deletions(-) New commits: commit 8d876c993e1f54c1a015e4a66eea47ad407bc142 Author: Joseph Powers jpower...@cox.net Date: Tue Nov 22 20:36:34 2011 -0800 Yet another empty pch file; in embeddedobj this time. diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx deleted file mode 100644 index 7b17fa7..000 --- a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -#include precompiled_embeddedobj.hxx - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx deleted file mode 100644 index 758cd7a..000 --- a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more
[Libreoffice-commits] .: 2 commits - basegfx/source basic/Package_inc.mk
basegfx/source/inc/PolygonPoint.hxx| 541 -
basegfx/source/inc/polygontemplate.hxx | 541 -
basic/Package_inc.mk |5
3 files changed, 1087 deletions(-)
New commits:
commit bb8f997864cb382591269d07e624360e66c192c8
Author: Joseph Powers jpower...@cox.net
Date: Mon Nov 7 07:21:08 2011 -0800
Stop exporting headers that no one uses outside of basic
diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index 7c0af3f..de1d9fb 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -41,19 +41,14 @@ $(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbdef.hxx,basic/sbdef.hxx)
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sberrors.hxx,basic/sberrors.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbmeth.hxx,basic/sbmeth.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbmod.hxx,basic/sbmod.hxx))
-$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbobjmod.hxx,basic/sbobjmod.hxx))
-$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbprop.hxx,basic/sbprop.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbstar.hxx,basic/sbstar.hxx))
-$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbstdobj.hxx,basic/sbstdobj.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbuno.hxx,basic/sbuno.hxx))
-$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxbase.hxx,basic/sbxbase.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxcore.hxx,basic/sbxcore.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxdef.hxx,basic/sbxdef.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxfac.hxx,basic/sbxfac.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxform.hxx,basic/sbxform.hxx))
$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbx.hxx,basic/sbx.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxmeth.hxx,basic/sbxmeth.hxx))
-$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxmstrm.hxx,basic/sbxmstrm.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxobj.hxx,basic/sbxobj.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxprop.hxx,basic/sbxprop.hxx))
$(eval $(call
gb_Package_add_file,basic_inc,inc/basic/sbxvar.hxx,basic/sbxvar.hxx))
commit 7dc14aba12e40b5df42bcf32fb9d3efb0dea5136
Author: Joseph Powers jpower...@cox.net
Date: Mon Nov 7 06:21:01 2011 -0800
Remove two more unused headers from basegfx
diff --git a/basegfx/source/inc/PolygonPoint.hxx
b/basegfx/source/inc/PolygonPoint.hxx
deleted file mode 100644
index b2c7aa8..000
--- a/basegfx/source/inc/PolygonPoint.hxx
+++ /dev/null
@@ -1,541 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _POLYGON_POINT_HXX
-#define _POLYGON_POINT_HXX
-
-#include vector
-
-//
-
-template class Point class SimplePointEntry
-{
-Point maPoint;
-
-public:
-SimplePointEntry()
-: maPoint(Point::getEmptyPoint())
-{
-}
-
-SimplePointEntry(const Point rInitPoint)
-: maPoint(rInitPoint)
-{
-}
-
-const Point getPoint() const
-{
-return maPoint;
-}
-
-void setPoint(const Point rValue)
-{
-maPoint = rValue;
-}
-
-bool operator==(const SimplePointEntry rEntry) const
-{
-return (maPoint == rEntry.maPoint);
-}
-};
-
-//
-
-template class Vector class SimpleBezierEntry
-{
-Vector maBackward;
-Vector maForward;
-
-public
[Libreoffice-commits] .: basebmp/inc basebmp/Package_inc.mk basebmp/source unusedcode.easy vcl/headless vcl/inc vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_svp.mk vcl/unx
basebmp/Package_inc.mk| 31 -- basebmp/inc/basebmp/bitmapdevice.hxx | 16 - basebmp/inc/basebmp/debug.hxx |2 basebmp/inc/basebmp/linerenderer.hxx | 184 basebmp/inc/basebmp/truecolormaskaccessor.hxx | 293 -- basebmp/source/bitmapdevice.cxx | 21 - unusedcode.easy |2 vcl/Library_vclplug_gtk3.mk |1 vcl/Library_vclplug_svp.mk|3 vcl/headless/svpgdi.cxx |1 vcl/headless/svpprn.cxx |3 vcl/headless/svppspgraphics.cxx | 200 - vcl/headless/svptext.cxx |1 vcl/inc/headless/svpprn.hxx |2 vcl/inc/headless/svppspgraphics.hxx | 43 --- vcl/unx/gtk/app/gtkinst.cxx |7 16 files changed, 5 insertions(+), 805 deletions(-) New commits: commit d0d62edf3f398e9ddb2fd0f1f5fbe1dd0393ff47 Author: Joseph Powers jpower...@cox.net Date: Thu Nov 3 20:25:04 2011 -0700 Cleanup basebmp a little I removed 2 unused headers. I also stopped delivering a lot of headers that no one outside of basebmp cared about. I also removed the unused methods: basebmp::BitmapDevice::getPaletteEntryCount() const basebmp::BitmapDevice::getPixelData(basegfx::B2IPoint const) diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk index 5619a30..b1298e9 100644 --- a/basebmp/Package_inc.mk +++ b/basebmp/Package_inc.mk @@ -2,7 +2,7 @@ #* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,40 +27,11 @@ #* $(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessor.hxx,basebmp/accessor.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessoradapters.hxx,basebmp/accessoradapters.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessorfunctors.hxx,basebmp/accessorfunctors.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessortraits.hxx,basebmp/accessortraits.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/basebmpdllapi.h,basebmp/basebmpdllapi.h)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/clippedlinerenderer.hxx,basebmp/clippedlinerenderer.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colorblendaccessoradapter.hxx,basebmp/colorblendaccessoradapter.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colormisc.hxx,basebmp/colormisc.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colortraits.hxx,basebmp/colortraits.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/compositeiterator.hxx,basebmp/compositeiterator.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/endian.hxx,basebmp/endian.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/fillimage.hxx,basebmp/fillimage.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/genericcolorimageaccessor.hxx,basebmp/genericcolorimageaccessor.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/greylevelformats.hxx,basebmp/greylevelformats.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/iteratortraits.hxx,basebmp/iteratortraits.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/linerenderer.hxx,basebmp/linerenderer.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/metafunctions.hxx,basebmp/metafunctions.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/nonstandarditerator.hxx,basebmp/nonstandarditerator.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/packedpixeliterator.hxx,basebmp/packedpixeliterator.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteformats.hxx,basebmp/paletteformats.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteimageaccessor.hxx,basebmp/paletteimageaccessor.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixelformatadapters.hxx,basebmp/pixelformatadapters.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixeliterator.hxx,basebmp/pixeliterator.hxx
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/bastype4.hxx | 69
1 file changed, 69 deletions(-)
New commits:
commit f65946944eca8da10d1e54a78eb2537e205e855c
Author: Joseph Powers jpower...@cox.net
Date: Wed Nov 2 05:56:25 2011 -0700
Remove an unused header from basctl
diff --git a/basctl/source/basicide/bastype4.hxx
b/basctl/source/basicide/bastype4.hxx
deleted file mode 100644
index 000eec7..000
--- a/basctl/source/basicide/bastype4.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _BASTYPE4_HXX
-#define _BASTYPE4_HXX
-
-
-#include svtools/tabbar.hxx
-
-class EditEngine;
-class EditView;
-
-class ExtendedTabBar : public TabBar
-{
-EditEngine* pEditEngine;
-EditView* pEditView;
-sal_BoolbIsInKeyInput;
-#if _SOLAR__PRIVATE
-voidImpCheckEditEngine( sal_Bool bKeepNewText );
-#endif
-protected:
-virtual voidMouseButtonDown( const MouseEvent rMEvt );
-virtual voidMouseButtonUp( const MouseEvent rMEvt );
-virtual voidMouseMove( const MouseEvent rMEvt );
-virtual voidLoseFocus();
-virtual voidKeyInput( const KeyEvent rKEvent );
-virtual voidPaint( const Rectangle );
-
-virtual sal_BoolStartRenamingTab( sal_uInt16 nCurId );
-virtual sal_BoolAllowRenamingTab( sal_uInt16 nCurId, const String
rNewName );
-virtual voidTabRenamed( sal_uInt16 nCurId, const String rNewName );
-
-public:
-ExtendedTabBar( Window* pParent, WinBits nStyle );
-~ExtendedTabBar();
-
-voidRenameSelectedTab();
-sal_BoolIsInEditMode() const { return pEditEngine ? sal_True :
sal_False; }
-voidStopEditMode( sal_Bool bKeepCurText = sal_False );
-};
-
-#endif //_BASTYPE4_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cli_ure/inc cli_ure/source
cli_ure/inc/pch/precompiled_cli_ure.cxx | 31 --- cli_ure/inc/pch/precompiled_cli_ure.hxx | 34 -- cli_ure/source/climaker/climaker_app.cxx |3 -- cli_ure/source/climaker/climaker_emit.cxx |3 -- cli_ure/source/native/assembly.cxx|3 -- cli_ure/source/uno_bridge/cli_bridge.cxx |3 -- cli_ure/source/uno_bridge/cli_data.cxx|3 -- cli_ure/source/uno_bridge/cli_environment.cxx |3 -- cli_ure/source/uno_bridge/cli_proxy.cxx |2 - cli_ure/source/uno_bridge/cli_uno.cxx |3 -- 10 files changed, 88 deletions(-) New commits: commit 0c9d2b9cb3f1b5bac034ccfee0eb83aa2182f2cf Author: Joseph Powers jpower...@cox.net Date: Wed Nov 2 06:39:08 2011 -0700 precompiled_cli_ure.hxx is empty, so just remove it diff --git a/cli_ure/inc/pch/precompiled_cli_ure.cxx b/cli_ure/inc/pch/precompiled_cli_ure.cxx deleted file mode 100644 index e11d204..000 --- a/cli_ure/inc/pch/precompiled_cli_ure.cxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -#include precompiled_cli_ure.hxx - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cli_ure/inc/pch/precompiled_cli_ure.hxx b/cli_ure/inc/pch/precompiled_cli_ure.hxx deleted file mode 100644 index 59c8eb0..000 --- a/cli_ure/inc/pch/precompiled_cli_ure.hxx +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.514782 - -#ifdef PRECOMPILED_HEADERS -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index 3d34498..b7f5db1 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -26,9 +26,6 @@ * / -// MARKER(update_precomp.py): autogen include statement, do not remove -#include precompiled_cli_ure.hxx - #include stdio.h #include vector #include memory diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 5415d8f..d7d20e4 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -26,9 +26,6 @@ * / -// MARKER(update_precomp.py): autogen include statement, do not remove -#include precompiled_cli_ure.hxx - #include climaker_share.h #include
[Libreoffice-commits] .: autodoc/inc autodoc/source
autodoc/inc/ary/actions.hxx | 105 --
autodoc/inc/ary/doc/d_parametrized.hxx| 124 --
autodoc/inc/ary/doc/ht/dht_interpreter.hxx| 79 --
autodoc/inc/ary/udmhost.hxx | 65 ---
autodoc/inc/autodoc/dsp_txt_flist.hxx | 67 ---
autodoc/source/ary/inc/cross_refs.hxx | 101 -
autodoc/source/ary/inc/sorted_idset.hxx | 99 -
autodoc/source/ary/inc/traits_impl.hxx| 122 -
autodoc/source/inc/manip.hxx | 63 ---
autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx | 65 ---
autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx | 84 --
11 files changed, 974 deletions(-)
New commits:
commit 0ba264cc9f8ab33c7081223a3612cfe6604b150f
Author: Joseph Powers jpower...@cox.net
Date: Mon Oct 31 21:29:39 2011 -0700
Delete some unused .hxx files from autodoc
diff --git a/autodoc/inc/ary/actions.hxx b/autodoc/inc/ary/actions.hxx
deleted file mode 100644
index 5e2536c..000
--- a/autodoc/inc/ary/actions.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef ARY_ACTIONS_HXX
-#define ARY_ACTIONS_HXX
-// KORR_DEPRECATED_3.0
-
-
-// USED SERVICES
-// BASE CLASSES
-// COMPONENTS
-// PARAMETERS
-
-
-namespace ary
-{
-class RepositoryCenter;
-
-
-/*
-enum E_Action
-{
-action_Parse,
-action_SecondaryProductions,
-action_Save,
-action_Load,
-action_ReadyForRead
-};
-*/
-
-
-/** @resp
-Performs such commands on the repository, which refer to
-large parts of it.
-
-@collab ::ary::Repository
-and its components and derivates.
-@descr
-This class works in kind of double dispatch way:
-
-// Client code:
-Command_Xy aMyCommand;
-ary::Repository::The_().PerformCommand( aMyCommand );
-
-// Repository_Implementation::PerformCommand() code:
-aMyCommand.Run(*this);
-
-// Command_Xy::Run(Repository_Implementation rRepository) code:
-rRepository.Run_Command_Xy(*this);
-*/
-class Command
-{
- public:
-virtual ~Command() {}
-
-voidRun(
-n22::RepositoryCenter
-io_rReposy );
- private:
-virtual voiddo_Run(
-n22::RepositoryCenter
-io_rReposy ) = 0;
-};
-
-
-// IMPLEMENTATION
-
-inline void
-Command::Run(n22::RepositoryCenter io_rReposy)
-{ do_Run(io_rReposy); }
-
-
-} // namespace ary
-
-
-#endif
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_parametrized.hxx
b/autodoc/inc/ary/doc/d_parametrized.hxx
deleted file mode 100644
index 78659e7..000
--- a/autodoc/inc/ary/doc/d_parametrized.hxx
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS
[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
binfilter/bf_svx/source/editeng/impedit.hxx | 80 ---
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 59 +---
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 45
binfilter/inc/bf_svx/editdata.hxx|6 -
4 files changed, 7 insertions(+), 183 deletions(-)
New commits:
commit a8230c23ef7021d153a5281e3e071934a8b5042d
Author: Joseph Powers jpower...@cox.net
Date: Sat Oct 22 05:05:59 2011 -0700
Cleanup class ImpEditEngine a little
diff --git a/binfilter/bf_svx/source/editeng/impedit.hxx
b/binfilter/bf_svx/source/editeng/impedit.hxx
index 16525d0..01685b5 100644
--- a/binfilter/bf_svx/source/editeng/impedit.hxx
+++ b/binfilter/bf_svx/source/editeng/impedit.hxx
@@ -101,17 +101,6 @@ namespace clipboard {
namespace binfilter {
-struct ImplIMEInfos
-{
-String aOldTextAfterStartPos;
-sal_uInt16* pAttribs;
-EditPaM aPos;
-sal_uInt16 nLen;
-sal_BoolbCursor;
-sal_BoolbWasCursorOverwrite;
-};
-
-
struct FormatterFontMetric
{
sal_uInt16 nMaxAscent;
@@ -138,40 +127,16 @@ private:
Window* pOutWin;
Pointer*pPointer;
-longnInvMore;
ULONG nControl;
-sal_uInt32 nTravelXPos;
-sal_uInt16 nExtraCursorFlags;
-sal_uInt16 nCursorBidiLevel;
-sal_uInt16 nScrollDiffX;
sal_BoolbReadOnly;
-sal_BoolbClickedInSelection;
-sal_BoolbActiveDragAndDropListener;
-Point aAnchorPoint;
Rectangle aOutArea;
Point aVisDocStartPos;
-EESelectionMode eSelectionMode;
EditSelection aEditSelection;
-EVAnchorModeeAnchorMode;
-
-protected:
-
-// DragAndDropClient
-
-
public:
~ImpEditView();
-EditView* GetEditViewPtr() { return pEditView; }
-
-sal_uInt16 GetScrollDiffX() const { return nScrollDiffX; }
-voidSetScrollDiffX( sal_uInt16 n ) { nScrollDiffX = n; }
-
-sal_uInt16 GetCursorBidiLevel() const { return nCursorBidiLevel;
}
-voidSetCursorBidiLevel( sal_uInt16 n ) { nCursorBidiLevel = n;
}
-
Point GetDocPos( const Point rWindowPos ) const;
Point GetWindowPos( const Point rDocPos ) const;
Rectangle GetWindowPos( const Rectangle rDocPos ) const;
@@ -180,9 +145,6 @@ public:
BOOLIsVertical() const;
-voidSetVisDocStartPos( const Point rPos ) { aVisDocStartPos =
rPos; }
-const PointGetVisDocStartPos() const { return aVisDocStartPos; }
-
longGetVisDocLeft() const { return aVisDocStartPos.X(); }
longGetVisDocTop() const { return aVisDocStartPos.Y(); }
longGetVisDocRight() const { return aVisDocStartPos.X() + (
!IsVertical() ? aOutArea.GetWidth() : aOutArea.GetHeight() ); }
@@ -198,36 +160,19 @@ public:
Window* GetWindow() const { return pOutWin; }
-EESelectionMode GetSelectionMode() const{ return eSelectionMode; }
-
inline void SetPointer( const Pointer rPointer );
-inline const Pointer GetPointer();
+inline constPointer GetPointer();
inline void SetCursor( const Cursor rCursor );
inline Cursor* GetCursor();
-
-EVAnchorModeGetAnchorMode() const { return eAnchorMode; }
voidShowCursor( sal_Bool bGotoCursor, sal_Bool
bForceVisCursor, BOOL test );
-sal_BoolIsInsertMode() const{ return ( ( nControl
EV_CNTRL_OVERWRITE ) == 0 ); }
-
-voidEnablePaste( sal_Bool bEnable ) { SetFlags(
nControl, EV_CNTRL_ENABLEPASTE, bEnable ); }
-sal_BoolIsPasteEnabled() const { return ( ( nControl
EV_CNTRL_ENABLEPASTE ) != 0 ); }
-
-sal_BoolDoSingleLinePaste() const { return ( ( nControl
EV_CNTRL_SINGLELINEPASTE ) != 0 ); }
-sal_BoolDoAutoScroll() const{ return ( ( nControl
EV_CNTRL_AUTOSCROLL ) != 0 ); }
-sal_BoolDoBigScroll() const { return ( ( nControl
EV_CNTRL_BIGSCROLL ) != 0 ); }
-sal_BoolDoAutoSize() const { return ( ( nControl
EV_CNTRL_AUTOSIZE ) != 0 ); }
-sal_BoolDoAutoWidth() const { return ( ( nControl
EV_CNTRL_AUTOSIZEX) != 0 ); }
-sal_BoolDoInvalidateMore() const{ return ( ( nControl
EV_CNTRL_INVONEMORE ) != 0 ); }
+sal_BoolIsInsertMode() const { return ( ( nControl
EV_CNTRL_OVERWRITE ) == 0 ); }
+sal_BoolDoAutoScroll() const { return ( ( nControl
EV_CNTRL_AUTOSCROLL ) != 0 ); }
const ColorGetBackgroundColor() const {
return ( pBackgroundColor ? *pBackgroundColor :
pOutWin-GetBackground().GetColor
[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx binfilter/inc
binfilter/bf_sd/source/ui/view/sd_frmview.cxx |1
binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx | 43 -
binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx |4
binfilter/bf_svx/source/svdraw/svx_svdmark.cxx | 19 --
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx |2
binfilter/inc/bf_svx/svddrgv.hxx| 204
binfilter/inc/bf_svx/svdxcgv.hxx|5
7 files changed, 4 insertions(+), 274 deletions(-)
New commits:
commit 184b91bc311b5d518215c106b0590bcc84b71ccf
Author: Joseph Powers jpower...@cox.net
Date: Mon Oct 10 08:05:11 2011 -0700
Cleanup class SdrDragView a little
diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index 1220694..516897e 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -296,7 +296,6 @@ void FrameView::Update(SdOptions* pOptions)
SetGridCoarse( Size( pOptions-GetFldDrawX(), pOptions-GetFldDrawY()
) );
SetGridFine( Size( pOptions-GetFldDivisionX(),
pOptions-GetFldDivisionY() ) );
-// SetSnapGrid( Size( pOptions-GetFldSnapX(), pOptions-GetFldSnapY() )
);
Fraction aFractX(pOptions-GetFldDrawX(), pOptions-GetFldDrawX() / (
pOptions-GetFldDivisionX() ? pOptions-GetFldDivisionX() : 1 ));
Fraction aFractY(pOptions-GetFldDrawY(), pOptions-GetFldDrawY() / (
pOptions-GetFldDivisionY() ? pOptions-GetFldDivisionY() : 1 ));
SetSnapGridWidth(aFractX, aFractY);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
index bba22a1..d774bb6 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
@@ -32,69 +32,31 @@
namespace binfilter {
-#define XOR_DRAG_PEN PEN_DOT
-
/*N*/ void SdrDragView::ImpClearVars()
/*N*/ {
-/*N*/ bFramDrag=FALSE;
/*N*/ eDragMode=SDRDRAG_MOVE;
-/*N*/ bDragLimit=FALSE;
/*N*/ bMarkedHitMovesAlways=FALSE;
-/*N*/ eDragHdl=HDL_MOVE;
-/*N*/ pDragHdl=NULL;
-/*N*/ bDragHdl=FALSE;
-/*N*/ bDragSpecial=FALSE;
-/*N*/ pDragBla=NULL;
/*N*/ bDragStripes=FALSE;
/*N*/ bNoDragHdl=TRUE;
/*N*/ bMirrRefDragObj=TRUE;
/*N*/ bSolidDragging=FALSE;
-/*N*/ bSolidDrgNow=FALSE;
-/*N*/ bSolidDrgChk=FALSE;
/*N*/ bDragWithCopy=FALSE;
-/*N*/ pInsPointUndo=NULL;
-/*N*/ bInsAfter=FALSE;
-/*N*/ bInsGluePoint=FALSE;
-/*N*/ bInsObjPointMode=FALSE;
-/*N*/ bInsGluePointMode=FALSE;
-/*N*/ nDragXorPolyLimit=100;
-/*N*/ nDragXorPointLimit=500;
/*N*/ bNoDragXorPolys=FALSE;
-/*N*/ bAutoVertexCon=TRUE;
-/*N*/ bAutoCornerCon=FALSE;
-/*N*/ bRubberEdgeDragging=TRUE;
-/*N*/ nRubberEdgeDraggingLimit=100;
-/*N*/ bDetailedEdgeDragging=TRUE;
-/*N*/ nDetailedEdgeDraggingLimit=10;
-/*N*/ bResizeAtCenter=FALSE;
-/*N*/ bCrookAtCenter=FALSE;
-/*N*/ bMouseHideWhileDraggingPoints=FALSE;
-/*N*/ }
-
-/*N*/ void SdrDragView::ImpMakeDragAttr()
-/*N*/ {
-/*N*/ ImpDelDragAttr();
/*N*/ }
/*N*/ SdrDragView::SdrDragView(SdrModel* pModel1, OutputDevice* pOut):
/*N*/ SdrExchangeView(pModel1,pOut)
/*N*/ {
/*N*/ ImpClearVars();
-/*N*/ ImpMakeDragAttr();
/*N*/ }
/*N*/ SdrDragView::~SdrDragView()
/*N*/ {
-/*N*/ ImpDelDragAttr();
-/*N*/ }
-
-/*N*/ void SdrDragView::ImpDelDragAttr()
-/*N*/ {
/*N*/ }
/*N*/ BOOL SdrDragView::IsAction() const
/*N*/ {
-/*N*/ return SdrExchangeView::IsAction() || pDragBla!=NULL;
+/*N*/ return SdrExchangeView::IsAction();
/*N*/ }
/*N*/ void SdrDragView::BrkAction()
@@ -118,8 +80,7 @@ namespace binfilter {
/*N*/ void SdrDragView::SetDragStripes(BOOL bOn)
/*N*/ {
-/*N*/ if ( !(pDragBla!=NULL aDragStat.IsShown() ) )
-/*N*/ bDragStripes=bOn;
+/*N*/ bDragStripes=bOn;
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
index c706ae6..a2952d0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
@@ -146,10 +146,6 @@ namespace binfilter {
/*N*/ {
/*N*/ // Das Standardlayerflag kam direkt nach der Betalieferung dazu
/*N*/ rIn rLayer.nType;
-/*N*/
-/*N*/ if(rLayer.nType == 1)
-/*N*/ {DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if(aHead.GetVersion() = 12)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
index 23e2deb..4aae881 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
@@ -33,29 +33,10 @@ namespace binfilter
[Libreoffice-commits] .: binfilter/bf_sch binfilter/inc
binfilter/bf_sch/source/core/sch_axisid.cxx |7 -
binfilter/bf_sch/source/core/sch_datapoin.cxx | 18 ---
binfilter/bf_sch/source/core/sch_datarow.cxx | 11 --
binfilter/bf_sch/source/core/sch_memchrt.cxx | 24
binfilter/bf_sch/source/core/sch_objadj.cxx | 13 --
binfilter/bf_sch/source/core/sch_objfac.cxx |2
binfilter/bf_sch/source/core/sch_objid.cxx| 18 ---
binfilter/bf_sch/source/ui/app/sch_schdll.cxx | 133 --
binfilter/bf_sch/util/bf_sch.map | 16 ---
binfilter/inc/bf_sch/datapoin.hxx |2
binfilter/inc/bf_sch/datarow.hxx |2
binfilter/inc/bf_sch/objadj.hxx |2
binfilter/inc/bf_sch/objid.hxx|2
binfilter/inc/bf_sch/schdll.hxx |6 -
binfilter/inc/bf_svx/svdobj.hxx |2
15 files changed, 9 insertions(+), 249 deletions(-)
New commits:
commit 4a8c673c912bdb38f2d17325aa1f4d078da47cc0
Author: Joseph Powers jpower...@cox.net
Date: Tue Oct 4 20:28:09 2011 -0700
The last of the easy DBG_BF_ASSERT from bf_sch
diff --git a/binfilter/bf_sch/source/core/sch_axisid.cxx
b/binfilter/bf_sch/source/core/sch_axisid.cxx
index 2ef3a1e..dc31350 100644
--- a/binfilter/bf_sch/source/core/sch_axisid.cxx
+++ b/binfilter/bf_sch/source/core/sch_axisid.cxx
@@ -34,13 +34,6 @@
#include glob.hxx
#include tools/debug.hxx
namespace binfilter {
-/*
-|*
-|* Objekt-Id ermitteln;
-|* Liefert -1, wenn das Objekt keine Id hat
-|*
-\/
-
/*
|*
diff --git a/binfilter/bf_sch/source/core/sch_datapoin.cxx
b/binfilter/bf_sch/source/core/sch_datapoin.cxx
index 2ef40b1..dd2bf9b 100644
--- a/binfilter/bf_sch/source/core/sch_datapoin.cxx
+++ b/binfilter/bf_sch/source/core/sch_datapoin.cxx
@@ -114,24 +114,6 @@ namespace binfilter {
/*
|*
-|* Kopier-Konstruktor
-|*
-\/
-
-
-/*
-|*
-|* Kopie erzeugen
-|*
-\/
-
-/*N*/ SdrObjUserData* SchDataPoint::Clone(SdrObject *) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP); return NULL;
-/*N*/ }
-
-/*
-|*
|* Daten aus Stream lesen
|*
\/
diff --git a/binfilter/bf_sch/source/core/sch_datarow.cxx
b/binfilter/bf_sch/source/core/sch_datarow.cxx
index bc59592..c9fc08e 100644
--- a/binfilter/bf_sch/source/core/sch_datarow.cxx
+++ b/binfilter/bf_sch/source/core/sch_datarow.cxx
@@ -110,17 +110,6 @@ namespace binfilter {
/*
|*
-|* Kopie erzeugen
-|*
-\/
-
-/*N*/ SdrObjUserData* SchDataRow::Clone(SdrObject *) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP); return NULL;
-/*N*/ }
-
-/*
-|*
|* Daten aus Stream lesen
|*
\/
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx
b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index bf5e151..2e620b1 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -26,13 +26,6 @@
*
/
-#ifndef _STREAM_HXX
-// enable stream operators / for UniString (8 Bit !)
-//#ifndef ENABLE_STRING_STREAM_OPERATORS
-//#define ENABLE_STRING_STREAM_OPERATORS
-//#endif
-#endif
-
#ifndef _ZFORLIST_HXX //autogen
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
@@ -586,12 +579,6 @@ namespace binfilter {
/*N*/ return rIn;
/*N*/ }
-/*
-|*
-|* QuickSort ueber Spalten
-|*
-\/
-
/*
|*
@@ -610,12 +597,6 @@ namespace binfilter {
/*N*/ pRowNumFmtId[i]=-1;
/*N*/ }
-/*
-|*
-|* QuickSort ueber Spalten
-|*
-\/
-
/*
|*
@@ -914,10 +895,7 @@ using namespace ::com::sun::star;
/*?*/ bool bNeedsQuoting = bNeedsEscaping || (
aIter-msTableName.indexOf( aSpace ) -1
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx |7
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 40 ---
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 18 --
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 31 -
binfilter/inc/bf_sc/collect.hxx | 23 +
binfilter/inc/bf_sc/column.hxx |1
binfilter/inc/bf_sc/document.hxx |1
binfilter/inc/bf_sc/dptabdat.hxx |2 -
8 files changed, 10 insertions(+), 113 deletions(-)
New commits:
commit c49dde7cea0c533da696752a064213c2d091e834
Author: Joseph Powers jpower...@cox.net
Date: Sun Oct 2 06:10:59 2011 -0700
Class TypedStrCollection is not really used, so I'm deleting it.
Plus some miscellanous DBG_BF_ASSERT cleanup.
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index 9aa89be..d3396c0 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -52,7 +52,6 @@ namespace binfilter {
/*N*/ longnColCount;
/*N*/ BOOLbIgnoreEmptyRows;
/*N*/ BOOLbRepeatIfEmpty;
-/*N*/ TypedStrCollection**ppStrings;
/*N*/ BOOL* pDateDim;
/*N*/ USHORT nNextRow; // for iterator, within range
/*N*/
@@ -72,10 +71,7 @@ namespace binfilter {
/*M*/ pImpl-bIgnoreEmptyRows = FALSE;
/*M*/ pImpl-bRepeatIfEmpty = FALSE;
/*M*/ pImpl-nColCount = nCount;
-/*M*/ pImpl-ppStrings = new TypedStrCollection*[nCount];
/*M*/ pImpl-pDateDim = NULL;
-/*M*/ for (long i=0; inCount; i++)
-/*M*/ pImpl-ppStrings[i] = NULL;
/*M*/
/*M*/ pImpl-nNextRow = pImpl-aRange.aStart.Row() + 1;
/*M*/
@@ -106,9 +102,6 @@ namespace binfilter {
/*N*/ ScSheetDPData::~ScSheetDPData()
/*N*/ {
-/*N*/ for (long i=0; ipImpl-nColCount; i++)
-/*N*/ delete pImpl-ppStrings[i];
-/*N*/ delete[] pImpl-ppStrings;
/*N*/ delete[] pImpl-pDateDim;
/*N*/ delete pImpl;
/*M*/ delete[] pSpecial;
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index 2ce86f7..773e5ba 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -193,13 +193,6 @@ namespace binfilter {
/*N*/ }
//
-
-/*N*/ DataObject* Collection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP); return NULL;
-/*N*/ }
-
-//
// SortedCollection
//
@@ -261,17 +254,6 @@ namespace binfilter {
//
-
-//
-
-
-//
-
-// IsEqual - komplette Inhalte vergleichen
-
-
-//
-
/*N*/ DataObject* StrData::Clone() const
/*N*/ {
return new StrData(*this); // #i49161# this is needed
@@ -292,13 +274,6 @@ namespace binfilter {
//
-/*N*/ DataObject* StrCollection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP); return NULL;
-/*N*/ }
-
-//
-
/*N*/ void StrCollection::Load( SvStream rStream ) // Changetracking.sdc
/*N*/ {
/*N*/ ScReadHeader aHdr( rStream );
@@ -318,8 +293,6 @@ namespace binfilter {
/*N*/ }
//
-// TypedStrCollection
-//
/*N*/ TypedStrData::TypedStrData( ScDocument* pDoc, USHORT nCol, USHORT nRow,
USHORT nTab,
/*N*/ BOOL bAllStrings )
@@ -345,19 +318,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ short TypedStrCollection::Compare( DataObject* /*pKey1*/, DataObject*
/*pKey2*/ ) const
-/*N*/ {
-/*N*/ short nResult = 0;
-DBG_BF_ASSERT(0, STRIP);
-/*N*/ return nResult;
-/*N*/ }
-
-
-// Gross-/Kleinschreibung anpassen
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index dbb3a44..e67a51f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -767,9 +767,9 @@ namespace binfilter {
/*N*/ bFound = ScGlobal::GetFuncCollection()-SearchFunc(cSymbol,
nIndex);
/*N*/ if( bFound )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP); /*N*/ ScRawToken
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_documen5.cxx |2 -
binfilter/bf_sc/source/core/data/sc_document.cxx |6 ---
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx | 45 ---
binfilter/inc/bf_sc/chartlis.hxx | 14 +--
4 files changed, 2 insertions(+), 65 deletions(-)
New commits:
commit 7cb861abf2f817eefd5ca4435639182fe477a095
Author: Joseph Powers jpower...@cox.net
Date: Sun Oct 2 08:37:05 2011 -0700
Cleanup class ScChartListenerCollection
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index 2230ac5..4bda4a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -163,8 +163,6 @@ void ScDocument::UpdateChartArea( const String rChartName,
aArray.SetRangeList( rNewList );
aArray.SetHeaders( bColHeaders, bRowHeaders );
}
-pChartListenerCollection-ChangeListening(
-rChartName, aArray.GetRangeList() );
SchMemChart* pMemChart = aArray.CreateMemChart();
ScChartArray::CopySettings( *pMemChart, *pChartData );
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 26643cd..f2d43b7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -283,9 +283,6 @@ namespace binfilter {
/*N*/ // update conditional formats after table is inserted
/*N*/ if ( pCondFormList )
/*N*/ pCondFormList-UpdateReference( URM_INSDEL, aRange,
0,0,1 );
-/*N*/ // #81844# sheet names of references are not valid until
sheet is inserted
-/*N*/ if ( pChartListenerCollection )
-/*N*/
pChartListenerCollection-UpdateScheduledSeriesRanges();
/*N*/
/*N*/ SetDirty();
/*N*/ bValid = TRUE;
@@ -351,7 +348,6 @@ namespace binfilter {
/*N*/ SetDirty();
/*N*/ }
/*N*/ // #81844# sheet names of references are not valid until
sheet is deleted
-/*N*/ pChartListenerCollection-UpdateScheduledSeriesRanges();
/*N*/ SetAutoCalc( bOldAutoCalc );
/*N*/ bValid = TRUE;
/*N*/ }
@@ -383,8 +379,6 @@ namespace binfilter {
/*N*/ if (bValid)
/*N*/ {
/*N*/ pTab[nTab]-SetName(rName);
-/*N*/ if ( pChartListenerCollection )
-/*N*/
pChartListenerCollection-UpdateSeriesRangesContainingTab( nTab );
/*N*/ }
/*N*/ }
/*N*/ return bValid;
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index 48cb6de..f6186d7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -112,16 +112,10 @@ using namespace ::com::sun::star;
/*N*/ delete pUnoData;
/*N*/ }
-/*N*/ DataObject* ScChartListener::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP);return NULL;
-/*N*/ }
-
/*N*/ void ScChartListener::SetUno(
/*N*/ const uno::Reference chart::XChartDataChangeEventListener
rListener,
/*N*/ const uno::Reference chart::XChartData rSource )
/*N*/ {
-/*N*/ //DBG_ASSERT( rListener.is() rSource.is(), Nullpointer bei
SetUno );
/*N*/ delete pUnoData;
/*N*/ pUnoData = new ScChartUnoData( rListener, rSource );
/*N*/ }
@@ -237,18 +231,6 @@ using namespace ::com::sun::star;
/*N*/ FreeAll();
/*N*/ }
-/*N*/ DataObject* ScChartListenerCollection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP);return NULL;
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::ChangeListening( const String /*rName*/,
-/*N*/ const ScRangeListRef /*rRangeListRef*/, BOOL /*bDirty*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-
/*N*/ void ScChartListenerCollection::FreeUnused()
/*N*/ {
/*N*/ // rueckwaerts wg. Pointer-Aufrueckerei im Array
@@ -325,33 +307,6 @@ using namespace ::com::sun::star;
/*N*/ }
-
-
-
-
-/*N*/ void ScChartListenerCollection::UpdateScheduledSeriesRanges()
-/*N*/ {
-/*N*/ for ( USHORT nIndex = 0; nIndex nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::UpdateSeriesRangesContainingTab( USHORT
nTab )
-/*N*/ {
-/*N*/ ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
-/*N*/ for ( USHORT nIndex = 0; nIndex nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-/*N*/ }
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/chartlis.hxx b/binfilter/inc/bf_sc/chartlis.hxx
index a40e7f9..5edda6d 100644
--- a/binfilter/inc/bf_sc/chartlis.hxx
[Libreoffice] Mac OS 10.4 Support
Just doing a little research and wanted to report my findings: 1. The last G3 Mac was sold in January 1999 - 12 years ago 2. The last G5 mac was sold in August 2006 - 5 years ago 2. Mac OS 10.5 was released in October 2007 - 4 years ago 3. The last security update for Mac OS 10.4 was September 2009 - 2 years ago 4. A lot of software developers are dropping Mac OS 10.4 support. a. VideoLAN - June 2009 b. Firefox - February 2010 c. Adobe Flash - All PPC Macs in Jun 2011 Please note that all G4 G5 PPC Macs can run 10.5; thus, 10.4 support is only needed for people who haven't upgraded to 10.5 or for Macs older then 11 years. If people don't want to upgrade the OS or still haven't replaced their 12 year old computer, what are the odds that they will be upgrading to the latest version of LibreOffice? I believe it's about time to drop 10.4 support in LibreOffice. The 3.4 release is quite good, so we can keep a versions of it around for those people who don't want to or can't upgrade their hardware/OS. How hard would it be to change the build system for 3.5+ (master) to allow it to build for 10.5? (With the release of 10.7, Apple will most likely end support for 10.5; however, I have a G5 Mac and don't want to retire it yet… it's the wife's computer). Most of this is because I'd like to Upgrade my box to 10.7 and the new version of xCode 4.1 (the Mac development suit) doesn't support 10.4. It also doesn't support PPC, so we'll still need to have a way to use the older xCode 3.2.6 for building the PPC binaries. By dropping 10.4 the build system should be able to use xCode 3.2.6 or 4.1 interchangeably. If we don't drop 10.4 support, I'm not sure how long Apple is going to keep xCode 3.2.6 available for download. Once it disappears, we'll have to drop 10.4 support since all new developers won't be able to get a compiler suite; this will also mean the end of our ability to support PPC. This post is mostly to get people thinking about the future of LibreOffice development. It would be nice to get consensus on when (i.e. which version) we should drop support of 10.4 in and also which version we should drop PPC support in general. Joe P. PS: I only upgraded to xCode 4.1 on a secondary drive. I'm going to only upgrade the main drive to Lion and leave xCode at 3.2.6 until we get decide to drop 10.4 support. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] Replace List with std::vector ImplBmpObj*
On Jul 20, 2011, at 3:20 AM, Matúš Kukan wrote: On 20 July 2011 04:51, Joseph Powers jpower...@cox.net wrote: I only compile for Mac OS; thus, I only compile /vcl/aqua /vcl/source. If you watch your compile, you should only compile /vcl/unx /vcl/source. We also have /vcl/win for those brave people who compile on Windows. I'm sorry again. Did not realize that. (Or forgot). Hopefully this is the last time... Joe P. Great. So I'm not here to approve patches but originally you were asking for Unix build and if you change #include List to #include list it will build without any errors or warnings for me. So probably you can push it. Thanks, Matus Thank you for all your help. I went ahead and pushed the patch. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Replace List with std::vector ImplBmpObj*
On Jul 19, 2011, at 12:51 AM, Matúš Kukan wrote:
Hi Joe,
On 19 July 2011 06:40, Joseph Powers jpower...@cox.net wrote:
I'd like someone doing a Unix build to review this for me. I compile Mac and
this is Unix only code so I don't just want to push and hope...
First I thought it would compile and want just to write something but
then I tried and it doesn't.
But my question is:
Would not it be better to replace List with std::list ? Or if vector I
don't like erase because it's not effective.
In this case I'd use maBmpList.pop_back(). On the first sight I
thought you have mistake in:
A List would be better; however, it's a list of pointers so the size isn't
that big.
void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
{
-for( ImplBmpObj* pObj = (ImplBmpObj*) maBmpList.Last(); pObj;
pObj = (ImplBmpObj*) maBmpList.Prev() )
+for( size_t i = maBmpList.size(); i; )
{
+ImplBmpObj* pObj = maBmpList[ --i ];
if( pObj-mpBmp == pBmp )
{
-maBmpList.Remove( pObj );
+maBmpList.erase( maBmpList.begin() + i );
pObj-mpBmp-ImplRemovedFromCache();
mnTotalSize -= pObj-mnMemSize;
delete pObj;
But then I realized you are decreasing i in ImplBmpObj* pObj = maBmpList[ --i
];
So - maBmpList.erase( maBmpList.begin() + i ); is in fact pop_back and
it's effective but personally I'd use the latter to avoid mistakes.
It's a loop and it's not just removing the last entry. It's only removing the
entry that matches the one passed. (I don't know why we're starting at the end
since the same pointer shouldn't be in the list twice; however, if the same
pointer gets in the list twice, then we'll always remove the last one instead
of the first one and I didn't wont to change this behavior).
Now here is what I got on 32bit Ubuntu:
vcl/unx/generic/gdi/salbmp.cxx: In member function ‘void
ImplSalBitmapCache::ImplAdd(X11SalBitmap*, sal_uLong, sal_uLong)’:
vcl/unx/generic/gdi/salbmp.cxx:1218: error: invalid use of incomplete
type ‘struct ImplSalBitmapCache::ImplBmpObj’
vcl/inc/unx/salbmp.h:253: error: forward declaration of ‘struct
ImplSalBitmapCache::ImplBmpObj’
Ok, just guessing but:
+struct ImplBmpObj;
+
class ImplSalBitmapCache
{
private:
+typedef ::std::vector ImplBmpObj* BmpList_impl;
-ListmaBmpList;
+BmpList_implmaBmpList;
sal_uIntPtr mnTotalSize;
Would most likely work better. I was defining struct ImplBmpObj inside the
ImplSalBitmapCache class and in the .cxx the actual struct was defined outside
the class; thus, we never defined the expected structure.
I was not investigating where the problem is, I think you can handle it.
Can you try the new version of the patch?
All the best,
Matus
Thanks for helping,
Joe P.
0001-Replace-List-with-std-vector-ImplBmpObj.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Replace List with std::vector ImplBmpObj*
On Jul 19, 2011, at 7:34 AM, Matúš Kukan wrote:
On 19 July 2011 14:22, Joseph Powers jpower...@cox.net wrote:
A List would be better; however, it's a list of pointers so the size
isn't that big.
So why not use it ?
I did not mean the actual size in memory but the number of elements.
I've seen there around 150 elements when I tried to print the size.
That's not really much but I think when we can use something better we should.
I don't really know how many elements there can be and how often we
are removing not from the end and what's the real difference in
effectiveness between list and vector but..
May be someone has opinion about this?
void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
{
-for( ImplBmpObj* pObj = (ImplBmpObj*) maBmpList.Last(); pObj;
pObj = (ImplBmpObj*) maBmpList.Prev() )
+for( size_t i = maBmpList.size(); i; )
{
+ImplBmpObj* pObj = maBmpList[ --i ];
if( pObj-mpBmp == pBmp )
{
-maBmpList.Remove( pObj );
+maBmpList.erase( maBmpList.begin() + i );
pObj-mpBmp-ImplRemovedFromCache();
mnTotalSize -= pObj-mnMemSize;
delete pObj;
But then I realized you are decreasing i in ImplBmpObj* pObj = maBmpList[
--i ];
So - maBmpList.erase( maBmpList.begin() + i ); is in fact pop_back and
it's effective but personally I'd use the latter to avoid mistakes.
It's a loop and it's not just removing the last entry. It's only removing
the entry that matches the one passed. (I don't know why we're starting at
the end since the same pointer shouldn't be in the list twice; however, if
the same pointer gets in the list twice, then we'll always remove the last
one instead of the first one and I didn't wont to change this behavior).
Ah, right, my fault. But now it's better to use list if you do not
need random access to elements. I mean maBmpList[ i ];
Ok, I changed from a stl::vector to a stl::list; I also rewrote the loops
to use an iterator instead of [] addressing since [] addressing can be
expensive with lists. I also rewrote the loop in question to find the 1st match
(there should only be one match) because it makes the logic cleaner and easier
to read.
Can you try the new version of the patch?
One more error:
maBmpList[ i ]-ImplRemovedFromCache(); should be
maBmpList[ i ]-mpBmp-ImplRemovedFromCache();
Now, just warning:
unx/generic/gdi/salbmp.cxx:1212: warning: ‘pObj’ may be used
uninitialized in this function
but that's not really true
Ok, I missed that one. I also added code to initialize pObj to NULL; some of
the developers like to compile with error on warnings and they'ed get really
mad if we left a warning.
I wonder if that was possible to compile for you but I have no
experience with other systems, so there may be big differences I'm not
used to.
I only compile for Mac OS; thus, I only compile /vcl/aqua /vcl/source. If you
watch your compile, you should only compile /vcl/unx /vcl/source. We also
have /vcl/win for those brave people who compile on Windows.
Anyway, good job, I like removing old things or replacing them with new.
Matus
Hopefully this is the last time...
Joe P.
0001-Replace-List-with-std-list-ImplBmpObj.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Replace List with std::vector ImplBmpObj*
I'd like someone doing a Unix build to review this for me. I compile Mac and this is Unix only code so I don't just want to push and hope... Thanks, Joe P. 0001-Replace-List-with-std-vector-ImplBmpObj.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] [PUSHED] Re: svtools/source/contnr/imivctl1.cxx not matching imivctl1.hxx
Maciej, Sorry about that. I try to change them in pairs and I must have missed that one. On 32bit GCC 4.0, sal_uLong and size_t are the same and don't error; however, people doing 64bit builds have issues. I changed the .hxx instead of the .cxx; we really should be using size_t instead of sal_uLong. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Errors building Animation
Matus, You removed component_getImplementationEnvironment in your patch 552bb0d5fc2e2d4b0934a9f7f017785962669fbb, While I don't really miss the function, some one seems to. From the looks of things, it appears like we have a list somewhere that insists that the function should be exported. Does anyone know where this list is? (I'm think it would be better to fix the list then to just add the code back in.) I've tried a make clean make from a new terminal window just to make sure I didn't have a stray file messing. I also looked through the animation directories and couldn't find anything that looked like it would help. The symbol is listed in animations/unxmacxi.pro/misc/unloadablecomponent_animcore.map.exported-symbols but I'm not sure how it gets created. = Building module animations = Entering /Users/jpowers27/LibO/animations/source/animcore Making:libanimcore.dylib Undefined symbols: _component_getImplementationEnvironment, referenced from: -exported_symbol[s_list] command line option ld: symbol(s) not found collect2: ld returned 1 exit status dmake: Error code 1, while making '../../unxmacxi.pro/lib/libanimcore.dylib' --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 65280 occurred while making /Users/jpowers27/LibO/animations/source/animcore it seems that the error is inside 'animations', please re-run build inside this module to isolate the error and/or test your fix: --- rm -Rf /Users/jpowers27/LibO/animations/unxmacxi.pro # optional module 'clean' /bin/sh cd /Users/jpowers27/LibO source ./MacOSXX86Env.Set.sh cd animations build when the problem is isolated and fixed exit and re-run 'make' from the top-level Thanks, Joe P. Mac OS 10.6.8 Python 2.6.1 GNU Make 3.81 Copyright (C) 2006 Free Software Foundation, Inc. This program built for i386-apple-darwin10.0 i686-apple-darwin10-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5494) Copyright (C) 2005 Free Software Foundation, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] LibreOffice (filters) mrcekets * filter/source/svg/ (7 files): Enhancing svg export
Can you verify that I didn't break your patch? My compiler (i686-apple-darwin10-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5494)) didn't like some of your code: /Users/jpowers27/LibO/clone/filters/filter/source/svg/svgexport.cxx: In member function 'sal_Bool SVGFilter::implExportDocument()': /Users/jpowers27/LibO/clone/filters/filter/source/svg/svgexport.cxx:798: error: call of overloaded 'valueOf(int)' is ambiguous /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1371: note: candidates are: static rtl::OUString rtl::OUString::valueOf(sal_Bool) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1385: note: static rtl::OUString rtl::OUString::valueOf(sal_Unicode) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1399: note: static rtl::OUString rtl::OUString::valueOf(sal_Int32, sal_Int16) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1416: note: static rtl::OUString rtl::OUString::valueOf(sal_Int64, sal_Int16) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1432: note: static rtl::OUString rtl::OUString::valueOf(float) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1448: note: static rtl::OUString rtl::OUString::valueOf(double) /Users/jpowers27/LibO/clone/filters/filter/source/svg/svgexport.cxx:799: error: call of overloaded 'valueOf(int)' is ambiguous /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1371: note: candidates are: static rtl::OUString rtl::OUString::valueOf(sal_Bool) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1385: note: static rtl::OUString rtl::OUString::valueOf(sal_Unicode) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1399: note: static rtl::OUString rtl::OUString::valueOf(sal_Int32, sal_Int16) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1416: note: static rtl::OUString rtl::OUString::valueOf(sal_Int64, sal_Int16) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1432: note: static rtl::OUString rtl::OUString::valueOf(float) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1448: note: static rtl::OUString rtl::OUString::valueOf(double) /Users/jpowers27/LibO/clone/filters/filter/source/svg/svgexport.cxx: In member function 'long int SVGFilter::CalcFieldHdl(EditFieldInfo*)': /Users/jpowers27/LibO/clone/filters/filter/source/svg/svgexport.cxx:1900: error: call of overloaded 'valueOf(sal_Int16)' is ambiguous /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1371: note: candidates are: static rtl::OUString rtl::OUString::valueOf(sal_Bool) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1385: note: static rtl::OUString rtl::OUString::valueOf(sal_Unicode) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1399: note: static rtl::OUString rtl::OUString::valueOf(sal_Int32, sal_Int16) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1416: note: static rtl::OUString rtl::OUString::valueOf(sal_Int64, sal_Int16) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1432: note: static rtl::OUString rtl::OUString::valueOf(float) /Users/jpowers27/LibO/solver/350/unxmacxi.pro/inc/rtl/ustring.hxx:1448: note: static rtl::OUString rtl::OUString::valueOf(double) dmake: Error code 1, while making '../../unxmacxi.pro/slo/svgexport.obj' My patch is: Fix some ambiguous method errors. commit bcf2a91f74e5c9ffe4b2978d53b7031a85d89ae4 (patch) Thanks, Joe P.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Replace List with std::vector
Ok, this patch compiles fine; however, I can't find where it's used. Also, I think it's unused; it looks a lot like leftovers of when OpenOffice had a web browser. If some can verify, that it's trash, a few pointers in to how to remove it would be nice. It looks like libs-gui/uui/source/services.cxx registers the component and sets up the factory for generating the dialogs. Because it's a component system, I'm not sure how to unplug it and/or verify how it would be used. The dialogs are: cookiedlg.cxx - cookie controls (the one I'm patching) fltdlg.cxx - filter logindlg.cxx- login masterpasscrtdlg.cxx- master password (is this the one used for documents?) nameclashdlg.cxx- Name Clash? newerverwarn.cxx- Newer Version (is this the Help == Check for Updates) passworddlg.cxx - password (I wonder what the difference is between master and normal) secmacrowarnings.cxx- Macro Security Warning sslwarndlg.cxx - SSL Warning unknownauthdlg.cxx - Unknown Authority It might be easy to just remove the ones we don't need and keep the other ones. As I said, any pointers would be nice. Thanks, Joe P. 0001-Replace-List-with-std-vector-CntHTTPCookie-svl.patch Description: Binary data 0001-Replace-List-with-std-vector-CntHTTPCookie-uui.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Replace List with std::vector
I'm sending the patch for review; not because it needs a lot but just to have someone verify that the memory was leaking and needs to be fixed. Current fixes: 1. XPropertyList::Clear() looks like it has a memory leek; so I fixed it. Future Fixes: 1. List* pBmpList; Should be replaced with a std::vector Bitmap* 2. I thinking that once pBmpList is a vector I should cleanup the constructors that pass initial size and resize values. 3. I'm noticing that several methods have extra parameters that aren't used. Should I include a patch to clean them up also? Thanks, Joe P. 0001-Replace-List-with-std-vector-XPropertyEntry.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] Replace List with std::vectorcom::sun::star::presentation::ClickAction in SD
Thanks for the patch. -- View this message in context: http://nabble.documentfoundation.org/PATCH-Replace-List-with-std-vector-com-sun-star-presentation-ClickAction-in-SD-tp3070174p3079742.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] Replace List with std::vectorSfxStyleSheetBase* in SD
Thanks for the patch. -- View this message in context: http://nabble.documentfoundation.org/PATCH-Replace-List-with-std-vector-SfxStyleSheetBase-in-SD-tp3070160p3079858.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] gdk-pixbuf compile error
On Jun 1, 2011, at 8:19 AM, Christian Lohmaier wrote: Hi *, On Wed, Jun 1, 2011 at 7:59 AM, Joseph Powers jpower...@cox.net wrote: [problem with gdk-pixbuf on Mac] Sure that it isn't just a problem with mixing linking against SDK and linking against the system? The modules that librsvg did now pull in to the build don't properly link against the SDK, so while it might find the system lib during compile, later on the SDK one is used or the other way round. Maybe that's the cause of the problems. ciao Christian I'm fairly sure it's not a link issue (at least not just a link issue): libtool: compile: /usr/bin/gcc-4.0 -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -DG_LOG_DOMAIN=\GdkPixbuf\ -DGDK_PIXBUF_COMPILATION -I.. -I.. -I../gdk-pixbuf -I../gdk-pixbuf -DGDK_PIXBUF_LOCALEDIR=\/Users/jpowers27/build/bootstrap/gdk-pixbuf/./unxmacxi.pro/misc/share/locale\ -DGDK_PIXBUF_LIBDIR=\/Users/jpowers27/build/bootstrap/gdk-pixbuf/./unxmacxi.pro/misc/lib\ -DGDK_PIXBUF_BINARY_VERSION=\2.10.0\ -DGDK_PIXBUF_PREFIX=\/Users/jpowers27/build/bootstrap/gdk-pixbuf/./unxmacxi.pro/misc\ -D_REENTRANT -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -DGDK_PIXBUF_ENABLE_BACKEND -DPIXBUF_LIBDIR=\/Users/jpowers27/build/bootstrap/gdk-pixbuf/./unxmacxi.pro/misc/lib/gdk-pixbuf-2.0/2.10.0/loaders\ -DBUILT_MODULES_DIR=\./.libs\ -isysroot /Developer/SDKs/MacOSX10.4u.sdk -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_DEPRECATED -I/Users/jpowers27/build/bootstrap/solver/350/unxmacxi.pro/inc/external -I/Users/jpowers27/build/bootstrap/solver/350/unxmacxi.pro/inc/external/glib-2.0 -I/Users/jpowers27/build/bootstrap/solver/350/unxmacxi.pro/inc/external/libpng -I/Users/jpowers27/build/bootstrap/solver/350/unxmacxi.pro/inc/external/libjpeg -Wall -MT io-png.lo -MD -MP -MF .deps/io-png.Tpo -c io-png.c -fno-common -DPIC -o .libs/io-png.o io-png.c: In function 'png_simple_error_callback': io-png.c:186: error: dereferencing pointer to incomplete type io-png.c: In function 'gdk_pixbuf__png_image_load': io-png.c:290: error: dereferencing pointer to incomplete type io-png.c:344: warning: passing argument 5 of 'png_get_iCCP' from incompatible pointer type io-png.c: In function 'gdk_pixbuf__png_image_begin_load': io-png.c:462: error: dereferencing pointer to incomplete type io-png.c: In function 'gdk_pixbuf__png_image_load_increment': io-png.c:534: error: dereferencing pointer to incomplete type io-png.c: In function 'png_info_callback': io-png.c:657: warning: format '%ld' expects type 'long int', but argument 5 has type 'png_uint_32' io-png.c:657: warning: format '%ld' expects type 'long int', but argument 6 has type 'png_uint_32' io-png.c:681: warning: passing argument 5 of 'png_get_iCCP' from incompatible pointer type io-png.c: In function 'png_error_callback': io-png.c:772: error: dereferencing pointer to incomplete type io-png.c: In function 'real_save_png': io-png.c:981: error: dereferencing pointer to incomplete type io-png.c:1009: warning: pointer targets in passing argument 5 of 'png_set_iCCP' differ in signedness make[4]: *** [io-png.lo] Error 1 make[3]: *** [all-recursive] Error 1 make[2]: *** [all] Error 2 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 dmake: Error code 2, while making './unxmacxi.pro/misc/build/so_built_so_gdk-pixbuf' The above was generated after applying your patch: LibreOffice (libs-extern-sys) lohmaier+LibreOffice * gdk-pixbuf/ (gdk-pixbuf-2.23.0.patch makefile.mk): compile gdk-pixbuf against SDK (Mac) Joe P.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] gdk-pixbuf compile error
I'm guessing that its failing on more then just Mac OS. I found a patch at
http://old.nabble.com/build-problems-with-libpng-1.5.1beta01-td30662957.html
that seams to work.
I'm not sure how to include it in our build system so I'm attaching including
it here. It doesn't apply cleanly so I had to do the @@ -459,7 +463,7 @@
gdk_pixbuf__png_image_begin_load (GdkPix section manually. Also, it looks like
we're using 2.23.0 while the latest stable is 2.22.1; so I'm guessing we may
find other issues. Also, the most resent unstable is 2.23.3 ( I couldn't find
the download site just the manual).
Can someone please verify integrate this somehow... also, because of the
patch isn't mine I'm not sure how licensing will work (the closest I noticed to
a licenese was here's the patch I used in case someone else needs it); the
lease we should do is make sure the two of them get some credit.
This is working now; however, I'm getting a segfault in an unrelated section of
code during make check.
Exception Type: EXC_BAD_ACCESS (SIGSEGV)
Exception Codes: KERN_INVALID_ADDRESS at 0x69727469
Crashed Thread: 0 Dispatch queue: com.apple.main-thread
Thread 0 Crashed: Dispatch queue: com.apple.main-thread
0 libuno_cppuhelpergcc3.dylib.3 0x002e8773
com::sun::star::uno::WeakReferenceHelper::get() const + 67
1 libdbamxi.dylib 0x5f97c65a
dbaccess::ODatabaseModelImpl::dispose() + 42
2 libdbamxi.dylib 0x5f9019e5
dbaccess::ODatabaseContext::disposing() + 101
3 libuno_cppuhelpergcc3.dylib.3 0x002d73be
cppu::WeakComponentImplHelperBase::dispose() + 158
4 libuno_cppuhelpergcc3.dylib.3 0x002fbc78
cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, rtl::OUString const,
com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey const)
+ 6120
5 libuno_cppuhelpergcc3.dylib.3 0x0030aabc
cppu::OComponentHelper::release() + 156
6 libuno_cppuhelpergcc3.dylib.3 0x002fe32c
cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, rtl::OUString const,
com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey const)
+ 16028
7 libuno_cppuhelpergcc3.dylib.3 0x002e8a38
cppu::OWeakAggObject::release() + 104
8 libuno_cppuhelpergcc3.dylib.3 0x0030aa8d
cppu::OComponentHelper::release() + 109
9 bootstrap.uno.dylib 0x04317693 component_getFactory + 90403
10 libuno_cppuhelpergcc3.dylib.3 0x002d73be
cppu::WeakComponentImplHelperBase::dispose() + 158
11 bootstrap.uno.dylib 0x04312bd8 component_getFactory + 71272
12 libuno_cppuhelpergcc3.dylib.3 0x00302552
cppu::createComponentContext(cppu::ContextEntry_Init const*, long,
com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext const)
+ 2466
13 libuno_cppuhelpergcc3.dylib.3 0x002d73be
cppu::WeakComponentImplHelperBase::dispose() + 158
14 libsofficeapp.dylib 0x000776d1 0x5a000 + 120529
15 libsofficeapp.dylib 0x00064059 0x5a000 + 41049
16 libvclmxi.dylib 0x017c9c4b DeInitVCL() + 1451
17 libvclmxi.dylib 0x017ca445 ImplSVMain() + 245
18 libvclmxi.dylib 0x0177d61b
AquaSalInstance::handleAppDefinedEvent(NSEvent*) + 75
19 libvclmxi.dylib 0x01ab511b -[VCL_NSApplication
sendEvent:] + 315
20 com.apple.AppKit0x989ee2a7 -[NSApplication run] + 917
21 com.apple.AppKit0x989e62d9 NSApplicationMain + 574
22 libvclmxi.dylib 0x0177f0a7 ImplSVMainHook(int*) + 343
23 libvclmxi.dylib 0x017ca571 SVMain() + 17
24 libsofficeapp.dylib 0x00098d85 soffice_main + 245
25 org.libreoffice.script 0x1ebe main + 30
26 org.libreoffice.script 0x1822 start + 258
27 org.libreoffice.script 0x1749 start + 41
So it looks like I know what I'm working on tomorrow...
Joe P.
$NetBSD: patch-af,v 1.1 2011/01/13 17:14:43 wiz Exp $
Fix build with png-1.5.
--- gdk-pixbuf/io-png.c.orig2010-07-10 00:54:35.0 +
+++ gdk-pixbuf/io-png.c
@@ -183,7 +183,11 @@ png_simple_error_callback(png_structp pn
error_msg);
}
+#if (PNG_LIBPNG_VER 10500)
longjmp (png_save_ptr-jmpbuf, 1);
+#else
+png_longjmp (png_save_ptr, 1);
+#endif
}
static void
@@ -287,7 +291,7 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
return NULL;
}
- if (setjmp (png_ptr-jmpbuf)) {
+ if (setjmp (png_jmpbuf(png_ptr))) {
g_free (rows);
if (pixbuf)
@@ -459,7 +463,7 @@ gdk_pixbuf__png_image_begin_load (GdkPix
return NULL;
}
- if (setjmp (lc-png_read_ptr-jmpbuf)) {
Re: [Libreoffice] crash in svtree re-factor ...
I'm showing: Exception Type: EXC_BAD_ACCESS (SIGBUS) Exception Codes: KERN_PROTECTION_FAILURE at 0x0004 Crashed Thread: 0 Dispatch queue: com.apple.main-thread Thread 0 Crashed: Dispatch queue: com.apple.main-thread 0 libtlmxi.dylib 0x014eb11a String::String(String const) + 10 1 libsvtmxi.dylib 0x00ac1075 SvTreeListBox::DefaultCompare(SvSortData*) + 53 2 libsvtmxi.dylib 0x00ad3f78 SvTreeList::Compare(SvListEntry*, SvListEntry*) const + 56 3 libsvtmxi.dylib 0x00ad4bcc SvTreeList::GetInsertionPos(SvListEntry*, SvListEntry*, unsigned long) + 188 4 libsvtmxi.dylib 0x00ad5345 SvTreeList::ResortChilds(SvListEntry*) + 133 5 libsvtmxi.dylib 0x00ad5435 SvTreeList::Resort() + 69 6 libcuimxi.dylib 0x60c07237 SvxPathTabPage::HeaderSelect_Impl(HeaderBar*) + 135 7 libcuimxi.dylib 0x60c0b72d SvxPathTabPage::Reset(SfxItemSet const) + 1181 8 libcuimxi.dylib 0x60c22d58 OfaTreeOptionsDialog::SelectHdl_Impl(Timer*) + 4840 9 libvclmxi.dylib 0x0176f19c Timer::Timeout() + 28 10 libvclmxi.dylib 0x0176f2b9 Timer::ImplTimerCallbackProc() + 121 11 libvclmxi.dylib 0x01a7a591 SalGetDesktopEnvironment() + 24929 And it's in the Options-Path not print... It does look like something I did... looking into it now. Joe P. On May 26, 2011, at 6:02 AM, Michael Meeks wrote: Hi there, Tools-Options - press arrow down a few times to the print options: Bang ... valgrind log appended. Seems to be a result of your conversion to stl types. Thanks, Michael. =15812== Invalid read of size 2 ==15812==at 0x4D09A28: SvPtrarr::Count() const (svarray.hxx:455) ==15812==by 0x4D65BAA: SvLBoxEntry::GetFirstItem(unsigned short) (svlbox.cxx:647) ==15812==by 0x4D77544: SvTreeListBox::DefaultCompare(SvSortData*) (svtreebx.cxx:2267) ==15812==by 0x4D77507: SvTreeListBox::LinkStubDefaultCompare(void*, void*) (svtreebx.cxx:2263) ==15812==by 0x4CF2694: Link::Call(void*) const (link.hxx:140) ==15812==by 0x4D8C8D9: SvTreeList::Compare(SvListEntry*, SvListEntry*) const (treelist.cxx:1939) ==15812==by 0x4D8CB5D: SvTreeList::GetInsertionPos(SvListEntry*, SvListEntry*, unsigned long) (treelist.cxx:1996) ==15812==by 0x4D8CA03: SvTreeList::ResortChilds(SvListEntry*) (treelist.cxx:1966) ==15812==by 0x4D8C93C: SvTreeList::Resort() (treelist.cxx:1948) ==15812==by 0x13B2D557: ??? (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libcuili.so) ==15812==by 0x13B2FCAF: ??? (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libcuili.so) ==15812==by 0x13B3FF3E: ??? (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libcuili.so) ==15812== Address 0xdee29b2 is 6 bytes after a block of size 20 alloc'd ==15812==at 0x402911D: malloc (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==15812==by 0x405FEF4: rtl_allocateMemory (in /data/opt/OOInstall/ure/lib/libuno_sal.so.3) ==15812==by 0x8048C53: ??? (in /data/opt/OOInstall/program/soffice.bin) ==15812==by 0x8048D15: operator new(unsigned int) (in /data/opt/OOInstall/program/soffice.bin) ==15812==by 0x4D89295: SvTreeEntryList::SvTreeEntryList(SvTreeEntryList) (treelist.cxx:129) ==15812==by 0x4D8C9A5: SvTreeList::ResortChilds(SvListEntry*) (treelist.cxx:1958) ==15812==by 0x4D8C93C: SvTreeList::Resort() (treelist.cxx:1948) ==15812==by 0x13B2D557: ??? (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libcuili.so) ==15812==by 0x13B2FCAF: ??? (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libcuili.so) ==15812==by 0x13B3FF3E: ??? (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libcuili.so) ==15812==by 0x57386AA: Link::Call(void*) const (in /data/opt/libreoffice/bootstrap/clone/libs-gui/vcl/unxlngi6.pro/lib/libvclli.so) ==15812==by 0x57453AA: Timer::Timeout() (in /data/opt/libreoffice/bootstrap/clone/libs-gui/vcl/unxlngi6.pro/lib/libvclli.so) ==15812== ==15812== Invalid read of size 4 ==15812==at 0x5487816: String::String(String const) (in /data/opt/libreoffice/bootstrap/solver/340/unxlngi6.pro/lib/libtlli.so) ==15812==by 0x4D473B3: SvLBoxString::GetText() const (svlbitm.hxx:133) ==15812==by 0x4D77555: SvTreeListBox::DefaultCompare(SvSortData*) (svtreebx.cxx:2267) ==15812==by 0x4D77507: SvTreeListBox::LinkStubDefaultCompare(void*, void*) (svtreebx.cxx:2263) ==15812==by 0x4CF2694: Link::Call(void*) const (link.hxx:140) ==15812==by 0x4D8C8D9: SvTreeList::Compare(SvListEntry*, SvListEntry*) const (treelist.cxx:1939) ==15812==by 0x4D8CB5D: SvTreeList::GetInsertionPos(SvListEntry*, SvListEntry*, unsigned long)
[Libreoffice] PATCH] Fix bug in CloneList (Rafael Dominguez) [PUSHED]
This patch fix a code i ommited in a previous commit 674c10b068d27d5ebdb25458d31dd8a61b343eb6, also should be included in 3.4.1 The patch looked ok to me. Also, it looks like he sent the same patch 3 times. It also allowed mmeeks new tests to get a lot further a long; before the patch the tests where dying after the 4th or 5th one. Joe P. ps: mmeeks, thanks for the long tests... now to see how many of the errors can be fixed... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUHED] Replace List for std::vectorString in SfxStringItemList
Sorry for the late notice... Joe P. On May 21, 2011, at 5:16 PM, Rafael Dominguez wrote: 0001-Remove-uneeded-parameter-for-Sort-functionlibs-gui.patch0002-Move-GetList-to-implementation-filelibs-gui.patch0003-Replace-List-for-std-vector-in-SfxStringListlibs-gui.patch0004-Remove-tools-list.hxx-includelibs-gui.patch0001-Replace-List-for-std-vector-Stringcomponents.patch0001-Replace-List-for-std-vector-Stringcalc.patch0002-Replace-List-for-std-vector-Stringcalc.patch0003-Replace-List-for-std-vector-Stringcalc.patch0001-Replace-List-with-std-vector-Stringwriter.patch0002-Replace-List-with-std-vector-Stringwriter.patch0003-Replace-List-for-std-vector-Stringwriter.patch0003-Replace-List-for-std-vector-Stringlibs-core.patch0004-Replace-List-with-std-vector-Stringlibs-core.patch0005-Replace-List-for-std-vector-Stringlibs-core.patch0006-Replace-List-for-std-vector-Stringlibs-core.patch0002-Replace-List-for-std-vector-Stringcomponents.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] Remove List container in components/imgprod
On Mar 9, 2011, at 6:41 AM, Rafael Dominguez wrote: 0001-Remove-deprecated-List-usage-in-component-imgprod.patch Looks good and make check worked on the Mac. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] Remove List in SdrObjListIter.
On Mar 8, 2011, at 1:39 PM, Rafael Dominguez wrote: 0001-Remove-deprecated-container-List-in-SdrObjListIter.patch Look good and make clean make check worked on Mac. Pushed, Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] List container cleaning in sd.
On Mar 4, 2011, at 5:29 PM, Rafael Dominguez wrote: 0001-Remove-of-deprecated-List-container.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] Remove DECLARE_LIST in idl.
On Mar 4, 2011, at 6:45 AM, Rafael Dominguez wrote: 0001-Remove-of-DECLARE_LIST.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] List container cleaning in sd.
On Mar 4, 2011, at 6:46 AM, Rafael Dominguez wrote: 0002-Remove-usage-of-deprecated-List-container.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] I'm seeing errors on the Mac smoketest.
On Mar 4, 2011, at 8:18 AM, Joseph Powers wrote:
***
Successful packaging process!
***
... creating log file log_OOO330_en-US.log
... creating follow me info file follow_me_OOO330_en-US.log.
Fri Mar 4 07:59:22 2011 (00:35 min.)
Installer finished
rm -f -r ./unxmacxi.pro/misc/smoketest/user
mkdir -p ./unxmacxi.pro/misc/smoketest/user
:
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}/Users/jpowers27/build/bootstrap/clone/testing/smoketestoo_native/unxmacxi.pro/lib:/Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/lib
/Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/bin/cppunit/cppunittester
\
-env:UNO_SERVICES=file:///Users/jpowers27/build/bootstrap/clone/testing/smoketestoo_native/./unxmacxi.pro/misc/smoketest/services.rdb
\
-env:UNO_TYPES=file:///Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/bin/types.rdb
\
-env:arg-soffice=path:/Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/installation/opt/LibreOffice.app/Contents/MacOS/soffice
-env:arg-user=./unxmacxi.pro/misc/smoketest/user \
-env:arg-env=DYLD_LIBRARY_PATH${DYLD_LIBRARY_PATH+=$DYLD_LIBRARY_PATH}
./unxmacxi.pro/lib/libsmoketest.dylib
-env:arg-doc=./unxmacxi.pro/bin/smoketestdoc.sxw
rm -f -r ./unxmacxi.pro/misc/smoketest/user
soffice(88675,0xa0917540) malloc: *** error for object 0x558b: pointer
being freed was not allocated
*** set a breakpoint in malloc_error_break to debug
soffice(88675,0xa0917540) malloc: *** error for object 0x2d0066: pointer
being freed was not allocated
*** set a breakpoint in malloc_error_break to debug
Never mind...
A make clean fixed it.
Joe P.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH][PUSHED] Remove tools/list.hxx in sw
Patched and built ok on Mac. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Libreoffice] [PATCH] [PUSHED] Remove dead code inside sd.
Patched and built ok on Mac. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove deprecated list container.[PUSHED]
On Feb 27, 2011, at 8:38 AM, Rafael Dominguez wrote: More list container cleaning. 0001-Remove-SvULongs-and-replace-it-with-std-ve.libs-core.patch0001-Remove-deprecated-container-List-and-update.libs-gui.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove deprecated list in svx/clonelist.hxx[PUSHED]
On Feb 27, 2011, at 1:56 PM, Rafael Dominguez wrote: 0001-Remove-deprecated-container-list-for-std-vector.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove of deprecated list container in calc. (Rafael Dominguez)[PUSHED]
I pushed this patch for Rafael. Joe P ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] DECLARE_LIST() Removal Project
Here's a quick update on the project: 1. The only items left are: binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( DdeConnections, DdeConnection* ) binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( DdeTransactions, DdeTransaction* ) binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( DdeFormats, long ) binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( StringList, String * ) binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( DdeServices, DdeService* ) binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( DdeTopics, DdeTopic* ) binfilter/inc/bf_svtools/svdde.hxx:DECLARE_LIST( DdeItems, DdeItem* ) idl/inc/lex.hxx:DECLARE_LIST( SvTokenList, SvToken * ) idl/inc/object.hxx:DECLARE_LIST( SvSlotElementList, SvSlotElement* ) idl/inc/types.hxx:DECLARE_LIST(SvMetaTypeList,SvMetaType *) svl/inc/svl/svdde.hxx:DECLARE_LIST( DdeConnections, DdeConnection* ) svl/inc/svl/svdde.hxx:DECLARE_LIST( DdeServices, DdeService* ) svl/inc/svl/svdde.hxx:DECLARE_LIST( DdeTopics, DdeTopic* ) svl/inc/svl/svdde.hxx:DECLARE_LIST( DdeItems, DdeItem* ) svl/inc/svl/svdde.hxx:DECLARE_LIST( DdeTransactions, DdeTransaction* ) svl/inc/svl/svdde.hxx:DECLARE_LIST( DdeFormats, long ) svl/inc/svl/svdde.hxx:DECLARE_LIST( StringList, String * ) svl/source/svdde/ddeimp.hxx:DECLARE_LIST( ConvList, Conversation* ); tools/inc/tools/list.hxx:// - DECLARE_LIST - tools/inc/tools/list.hxx:#define DECLARE_LIST( ClassName, Type ) \ tools/inc/tools/ref.hxx:DECLARE_LIST(CN##List,EN)\ 2. We also have a few locations where the List class is used directly with out the DECLARE_LIST() macro. My work order is: 1. Reduce the number of #include tools/list.hxx down to a minimum (it should only be used in areas that use the List class). 2. Convert the binfilter svl items above to a ::std::vector or similar template. These files are only used on MS-Windows which I don't build on, so I'm going to just create the patches and then send them to Fridrich who volunteered to make sure the build ok. 3. Fix the tools/inc/tools/ref.hxx usage of DECLARE_LIST. The issue here is that it's a macro that's used in several locations. Rafael is working on the following areas: 1. Convert the idl items above. 2. Start converting the code that uses the List class. Joe P. PS: Rafeal, I pushed your patch to convert the std::vector to boost::ptr_vector in writer. Sorry I don't know how to preserve your submitter information (my git foo is bad). I had one section that did not apply cleanly so I had to patch that section manually. Can you double check my work and make sure it's what you wanted? I did a make check and also tested the menu item directly and it seems to work. author Joseph Powers jpower...@cox.net 2011-02-21 04:13:57 (GMT) committer Joseph Powers jpower...@cox.net 2011-02-21 04:13:57 (GMT) commit 5d8a59f64d9d3931e2c9c1ba98f57cd10e0b01c1 (patch) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] DECLARE_LIST() Removal
Rafael, I believe we are almost done. The only ones I show as remaining are: binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( DdeConnections, DdeConnection* ) windows binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( DdeTransactions, DdeTransaction* )windows binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( DdeFormats, long ) windows binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( StringList, String * ) windows binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( DdeServices, DdeService* )windows binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( DdeTopics, DdeTopic* ) windows binfilter/inc/bf_svtools/svdde.hxx DECLARE_LIST( DdeItems, DdeItem* ) windows svl/inc/svl/svdde.hxx DECLARE_LIST( DdeConnections, DdeConnection* ) windows svl/inc/svl/svdde.hxx DECLARE_LIST( DdeServices, DdeService* )windows svl/inc/svl/svdde.hxx DECLARE_LIST( DdeTopics, DdeTopic* )windows svl/inc/svl/svdde.hxx DECLARE_LIST( DdeItems, DdeItem* ) windows svl/inc/svl/svdde.hxx DECLARE_LIST( DdeTransactions, DdeTransaction* ) windows svl/inc/svl/svdde.hxx DECLARE_LIST( DdeFormats, long )windows svl/inc/svl/svdde.hxx DECLARE_LIST( StringList, String * )windows svl/source/svdde/ddeimp.hxx DECLARE_LIST( ConvList, Conversation* ); windows tools/inc/tools/ref.hxx DECLARE_LIST(CN##List,EN)\ idl/inc/lex.hxx DECLARE_LIST( SvTokenList, SvToken * ) idl/inc/object.hxx DECLARE_LIST( SvSlotElementList, SvSlotElement* ) idl/inc/types.hxx DECLARE_LIST(SvMetaTypeList,SvMetaType *) vcl/source/window/toolbox.cxx DECLARE_LIST( ImplTBList, ToolBox* ) vcl/unx/inc/saldata.hxx DECLARE_LIST( SalDisplays, SalDisplay* ) vcl/unx/inc/saldisp.hxx DECLARE_LIST( SalFontCache, ExtendedFontStruct* ) vcl/unx/inc/salfont.h DECLARE_LIST( SalFontCache, SalFontCacheItem* ) vcl/unx/inc/salfont.h DECLARE_LIST( SalFontStructList, SalFontStruct* ) I really liked your work on sw/source/ui/inc/swuicnttab.hxx and thank you for your help. If you're building on a MS-Windows box it would be nice if you could look at the ones flagged as windows above. I stated deleting all the extra #include tools/list.hxx from the source code; it's only needed in locations where the List type is used directly. As for the code using the List data type, I'm thinking we should change them; however, we should check the lead developers and get their opinion first. I'm thinking all C++ programmers should know STL (if they don't, the better start learning it); we can't expect them to know how our in house List type works. I should be able to finish up the vcl ones this weekend. Just warning you so we don't keep working on the same one again. The idl ones are more completed then normal, so I skipped them; you can have them if you want (warning types.hxx is using some reference counting code I haven't taken the time to work out). The tools/inc/tools/ref.hxx is another one that needs a lot of love. It's actually part of a macro which is used all over the place. All the locations where this macro is used will also need to be cleanup so this could be a nice month long project. If you want it, just say so and I'll start looking into one of the other macros. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] cui pre-compiled headers
While removing some extra references to bootstrp/sstring.hxx, I noticed that the precompiled_cui.hxx file is just one big #if 0 ... #endif statement. I see two ways of fixing this: 1) Remove the #if 0 and see what breaks and then look at removing extra #include from the other files. 2) Remove the #include precompiled_cui.hxx from all the other source files. I'm more of the option of doing option #2 since it requires the least amount of work (only about 60 files include the header) and we haven't been using the precompiled header anyways. I just wanted to put this up to a vote before just ripping out the file. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Break Failure with Application::ShowHelpStatusText()
It looks like this wasn't removed from some of the test code in bootstrap/automation/util. I need to go to work and wont be back home until late Saturday so, so I don't have time to fix. Just wanted to give someone a heads up. I tried rm -rf unmacxi.pro in the automations directory but that didn't fix it. Making: ../unxmacxi.pro/misc/communimxi.flt Making:libstsmxi.dylib Making:libstsmxi.dylib.jnilib macosx-create-bundle: ../unxmacxi.pro/lib/libstsmxi.jnilib successfully created /Users/jpowers27/build/bootstrap/solenv/bin/checkdll.sh -L../unxmacxi.pro/lib -L/Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/lib ../unxmacxi.pro/lib/libstsmxi.dylib Checking DLL ../unxmacxi.pro/lib/libstsmxi.dylib ...: ok Making:libsimplecmmxi.dylib Making:libsimplecmmxi.dylib.jnilib macosx-create-bundle: ../unxmacxi.pro/lib/libsimplecmmxi.jnilib successfully created /Users/jpowers27/build/bootstrap/solenv/bin/checkdll.sh -L../unxmacxi.pro/lib -L/Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/lib ../unxmacxi.pro/lib/libsimplecmmxi.dylib Checking DLL ../unxmacxi.pro/lib/libsimplecmmxi.dylib ...: ok Making:libcommunimxi.dylib Making:libcommunimxi.dylib.jnilib macosx-create-bundle: ../unxmacxi.pro/lib/libcommunimxi.jnilib successfully created /Users/jpowers27/build/bootstrap/solenv/bin/checkdll.sh -L../unxmacxi.pro/lib -L/Users/jpowers27/build/bootstrap/solver/330/unxmacxi.pro/lib ../unxmacxi.pro/lib/libcommunimxi.dylib Checking DLL ../unxmacxi.pro/lib/libcommunimxi.dylib ...: ok Making:testtool unx Undefined symbols: Application::ShowHelpStatusText(String const), referenced from: vtable for BasicAppin libapp.a(app.o) Application::HideHelpStatusText(), referenced from: vtable for BasicAppin libapp.a(app.o) ld: symbol(s) not found collect2: ld returned 1 exit status dmake: Error code 1, while making '../unxmacxi.pro/bin/testtool' Forcing regeneration of dependency info nothing to do here... Retrying /Users/jpowers27/build/bootstrap/automation/util Making:testtool unx Undefined symbols: Application::ShowHelpStatusText(String const), referenced from: vtable for BasicAppin libapp.a(app.o) Application::HideHelpStatusText(), referenced from: vtable for BasicAppin libapp.a(app.o) ld: symbol(s) not found collect2: ld returned 1 exit status dmake: Error code 1, while making '../unxmacxi.pro/bin/testtool' Thanks, Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove DECLARE_LIST( EditList, AppWIn*)
The attached patch compiles and stands up to my limited testing; however, it's a large patch and touches a lot of sensitive code so I want someone with better knowledge of the Basic Macro Editor environment to review test it before I try pushing it. Thanks, Joe P. 0001-Remove-DECLARE_LIST-EditList-AppWin.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] SfxDocTplService_Impl posable memory leek
Source in question: sfx2/source/doc/doctemplates.cxx
The code looks like this:
//-
struct NamePair_Impl
{
OUString maShortName;
OUString maLongName;
};
DECLARE_LIST( NameList_Impl, NamePair_Impl* )
class SfxDocTplService_Impl
{
...
NameList_Impl maNames;
...
voidreadFolderList();
OUStringgetLongName( const OUString
rShortName );
...
}
void SfxDocTplService_Impl::readFolderList()
{
SolarMutexGuard aGuard;
ResStringArray aShortNames( SfxResId( TEMPLATE_SHORT_NAMES_ARY ) );
ResStringArray aLongNames( SfxResId( TEMPLATE_LONG_NAMES_ARY ) );
NamePair_Impl* pPair;
USHORT nCount = (USHORT)( Min( aShortNames.Count(), aLongNames.Count() ) );
for ( USHORT i=0; inCount; i++ )
{
pPair = new NamePair_Impl;
pPair-maShortName = aShortNames.GetString( i );
pPair-maLongName = aLongNames.GetString( i );
maNames.Insert( pPair, LIST_APPEND );
}
}
OUString SfxDocTplService_Impl::getLongName( const OUString rShortName )
{
OUString aRet;
NamePair_Impl *pPair = maNames.First();
while ( pPair )
{
if ( pPair-maShortName == rShortName )
{
aRet = pPair-maLongName;
break;
}
else
pPair = maNames.Next();
}
if ( !aRet.getLength() )
aRet = rShortName;
return aRet;
}
//-
No where in the code can I see where maNames gets cleanup up. The only
destructor is in the base class which just cleans up the list memory and
doesn't free the NamePair_Impl memory.
Container::~Container()
{
DBG_DTOR( Container, DbgCheckContainer );
// Alle Bloecke loeschen
CBlock* pBlock = pFirstBlock;
while ( pBlock )
{
CBlock* pTemp = pBlock-GetNextBlock();
delete pBlock;
pBlock = pTemp;
}
}
I'm thinking of just adding code to ~SfxDocTplService_Impl() to free the
NamePair_Impl items.
What I'd like to know is the following:
1. Am I reading this correctly?
2. Where is this uses, so I can test my changes? (I'm converting the above code
to use a vector)
The use path is:
NamePair_Impl
SfxDocTplService_Impl
Updater_Impl
SfxDocTplService_Impl (yes, it's a circular definition)
SfxDocTplService
SfxDocTplService is registered as com.sun.star.frame.DocumentTemplates
which gets used in:
svtools/source/contnr/templwin.cxx
sd/source/ui/dlg/TemplateScanner.cxx
Joe P.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove DECLARE_LIST(TOXControlList, Control*)
I found where this code is used: Writer - Insert - Indexes and Tables -
Indexes and Tables - Entries.
Currently I can't build due to a non-related issue so I can't trouble shoot it.
My git foo is also bad enough that I can't figure out how to remove it...
Needless to say, my patch causes a SegFault when every the tab is selected. Can
I get someone to remove the patch; I need to fix it and I don't want people
having issues until then.
Thanks,
Joe P.
On Dec 12, 2010, at 9:35 PM, Joseph Powers wrote:
The patch for DECLARE_LIST( SwXMLFrmFmts_Impl, SwFrmFmtPtr ) was really easy
so I pushed it...
However, long story short, I also ended up pushing this patch. If anyone has
any issues, it can be reverted.
I'm sorry for the confusion.
Joe P.
On Dec 12, 2010, at 8:26 PM, Joseph Powers wrote:
TOXControlList is used more like a list then a vector; however, the code
was written using mostly [] style accessors. Thus, I had to rewrite a lot of
control logic and would like someone else to review it before it gets
installed.
Two methods where looping through the list list.size() times. Looking at the
code, I couldn't determine why this had to be done so I changed the code to
only process the list once. The methods are:
IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit)
IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, SwTOXButton*, pBtn )
I played around in writer a little bit but couldn't figure out where this
code was being used. If someone could point me in the right direction, I'll
do a little more testing.
0001-Remove-DECLARE_LIST-TOXControlList-Control.patch
I'm having some issues removing DECLARE_LIST( SwXMLTableLinesCache_Impl,
SwXMLTableLinesPtr ) from sw/source/filter/xml/xmltble.cxx.
The main issue is that my compiler (g++ 4.0) doesn't allow the following:
class Foo;
class Bar {
Foo* myFoo;
}
class Foo {
int mySomething;
}
typedef ::std::vector Foo* typeFoo;
Because of this, I need to move enough information from the .cxx into .hxx
to define Foo before Bar; however, Foo is build using some more magic Macros
so I don't know how much code I can safely move to the header. Any
suggestions on this would be nice.
The only two DECLARE_LIST() instances left in writer are the above and
DECLARE_LIST( SwXMLFrmFmts_Impl, SwFrmFmtPtr ) which is declared in the same
.cxx as the one problem one. I'm going to see if it has the same issue.
Thanks for your help,
Joe P.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove DECLARE_LIST(TOXControlList, Control*)
TOXControlList is used more like a list then a vector; however, the code was written using mostly [] style accessors. Thus, I had to rewrite a lot of control logic and would like someone else to review it before it gets installed.Two methods where looping through the list list.size() times. Looking at the code, I couldn't determine why this had to be done so I changed the code to only process the list once. The methods are:IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit)IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, SwTOXButton*, pBtn )I played around in writer a little bit but couldn't figure out where this code was being used. If someone could point me in the right direction, I'll do a little more testing.
0001-Remove-DECLARE_LIST-TOXControlList-Control.patch
Description: Binary data
I'm having some issues removingDECLARE_LIST( SwXMLTableLinesCache_Impl, SwXMLTableLinesPtr ) fromsw/source/filter/xml/xmltble.cxx.The main issue is that my compiler (g++ 4.0) doesn't allow the following:class Foo;class Bar { Foo* myFoo;}class Foo { int mySomething;}typedef ::std::vector Foo* typeFoo;Because of this, I need to move enough information from the .cxx into .hxx to define Foo before Bar; however, Foo is build using some more magic Macros so I don't know how much code I can safely move to the header. Any suggestions on this would be nice.The only two DECLARE_LIST() instances left in writer are the above andDECLARE_LIST( SwXMLFrmFmts_Impl, SwFrmFmtPtr ) which is declared in the same .cxx as the one problem one. I'm going to see if it has the same issue.Thanks for your help,Joe P.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove DECLARE_LIST(TOXControlList, Control*)
The patch for DECLARE_LIST( SwXMLFrmFmts_Impl, SwFrmFmtPtr ) was really easy so
I pushed it...
However, long story short, I also ended up pushing this patch. If anyone has
any issues, it can be reverted.
I'm sorry for the confusion.
Joe P.
On Dec 12, 2010, at 8:26 PM, Joseph Powers wrote:
TOXControlList is used more like a list then a vector; however, the code
was written using mostly [] style accessors. Thus, I had to rewrite a lot of
control logic and would like someone else to review it before it gets
installed.
Two methods where looping through the list list.size() times. Looking at the
code, I couldn't determine why this had to be done so I changed the code to
only process the list once. The methods are:
IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit)
IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, SwTOXButton*, pBtn )
I played around in writer a little bit but couldn't figure out where this
code was being used. If someone could point me in the right direction, I'll
do a little more testing.
0001-Remove-DECLARE_LIST-TOXControlList-Control.patch
I'm having some issues removing DECLARE_LIST( SwXMLTableLinesCache_Impl,
SwXMLTableLinesPtr ) from sw/source/filter/xml/xmltble.cxx.
The main issue is that my compiler (g++ 4.0) doesn't allow the following:
class Foo;
class Bar {
Foo* myFoo;
}
class Foo {
int mySomething;
}
typedef ::std::vector Foo* typeFoo;
Because of this, I need to move enough information from the .cxx into .hxx to
define Foo before Bar; however, Foo is build using some more magic Macros so
I don't know how much code I can safely move to the header. Any suggestions
on this would be nice.
The only two DECLARE_LIST() instances left in writer are the above and
DECLARE_LIST( SwXMLFrmFmts_Impl, SwFrmFmtPtr ) which is declared in the same
.cxx as the one problem one. I'm going to see if it has the same issue.
Thanks for your help,
Joe P.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Removal of DECLARE_LIST() from Calc
Ok, the shadow on P is mine and is harmless. I've modified the code to remove
the warning:
void ScViewFunc::MarkAndJumpToRanges(const ScRangeList rRanges)
{
ScViewData* pView = GetViewData();
ScDocShell* pDocSh = pView-GetDocShell();
ScRangeList aRanges(rRanges);
ScRange* p = aRanges.front();
ScRangeList aRangesToMark;
ScAddress aCurPos = pView-GetCurPos();
for ( size_t i = 0, ListSize = aRanges.size(); i ListSize; ++i )
{
p = aRanges.at( i );
// Collect only those ranges that are on the same sheet as the current
// cursor.
if (p-aStart.Tab() == aCurPos.Tab())
aRangesToMark.Append(*p);
}
if (aRangesToMark.empty())
return;
// Jump to the first range of all precedent ranges.
p = aRangesToMark.front();
lcl_jumpToRange(*p, pView, pDocSh-GetDocument());
for ( size_t i = 0, ListSize = aRangesToMark.size(); i ListSize; ++i )
{
p = aRangesToMark.at( i );
MarkRange(*p, false, true);
}
}
The others are pointing to things I didn't change, so I'm a little at a lost as
to why the errors where generated.
Joe P.
On Dec 9, 2010, at 2:21 AM, Norbert Thiebaud wrote:
On Thu, Dec 9, 2010 at 12:55 AM, Joseph Powers jpower...@cox.net wrote:
I'm converting ScRangeList from DECLARE_LIST( ScRangeListBase, ScRange* )
to ::STD::vector ScRange* ScRangeListBase
The most of the code boring and unlikely to cause issues; however, some
areas need further review:
sc/source/core/tool/rangelst.cxx - This is the main class ScRangeList and a
child of ScRangeListBase. If this is wrong, we're in trouble.
- I changed GetCellCount() from ULONG to size_t which is more correct. Can
someone verify that this doesn't break 64bit builds?
sc/source/ui/miscdlgs/acredin.cxx
- Re-wrote some logic to not use iterators. A review would be nice.
sc/source/ui/unoobj/cellsuno.cxx
- The is huge with lots of changes.
I now pass a few size_t values to sal_Int32 sal_uInt32 parameters. The Mac
build only supports 32bits currently so this isn't an issue. I need someone
with a 64bit build machine to review this patch.
Ok, I built it on a linux 64bits:
it build, but I get few warnings... not certain they are related, but
still so you know:
/lo/feature/bootstrap/clone/calc/sc/source/ui/view/viewfun6.cxx: In
member function 'void ScViewFunc::MarkAndJumpToRanges(const
ScRangeList)':
/lo/feature/bootstrap/clone/calc/sc/source/ui/view/viewfun6.cxx:176:
warning: declaration of 'p' shadows a previous local
/lo/feature/bootstrap/clone/calc/sc/source/ui/view/viewfun6.cxx:170:
warning: shadowed declaration is here
Compiling: sc/source/ui/dbgui/tpsubt.cxx
In file included from
/lo/feature/bootstrap/solver/330/unxlngx6.pro/inc/boost/ptr_container/ptr_map_adapter.hpp:20,
from
/lo/feature/bootstrap/solver/330/unxlngx6.pro/inc/boost/ptr_container/ptr_map.hpp:21,
from ../inc/xichart.hxx:47,
from
/lo/feature/bootstrap/clone/calc/sc/source/filter/excel/xichart.cxx:33:
/lo/feature/bootstrap/solver/330/unxlngx6.pro/inc/boost/ptr_container/detail/map_iterator.hpp:52:
warning: type qualifiers ignored on function return type
Compiling: sc/source/ui/dbgui/validate.cxx
Compiling: sc/source/filter/excel/xlescher.cxx
Compiling: sc/source/filter/excel/xlroot.cxx
Compiling: sc/source/filter/excel/xltools.cxx
In file included from
/lo/feature/bootstrap/solver/330/unxlngx6.pro/inc/boost/ptr_container/ptr_map_adapter.hpp:20,
from
/lo/feature/bootstrap/solver/330/unxlngx6.pro/inc/boost/ptr_container/ptr_map.hpp:21,
from ../inc/xichart.hxx:47,
from
/lo/feature/bootstrap/clone/calc/sc/source/filter/excel/xiescher.cxx:113:
/lo/feature/bootstrap/solver/330/unxlngx6.pro/inc/boost/ptr_container/detail/map_iterator.hpp:52:
warning: type qualifiers ignored on function return type
other than that. make dev-install + open of few speadsheet did not
show anything alarming :-)
Norbert
Joe P.
ps: Sorry about the size... but I had to change everything in one pass or
not at all.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] HC Cleanup
On Nov 23, 2010, at 4:54 AM, Michael Meeks wrote:
Hi Joseph,
On Mon, 2010-11-22 at 19:18 -0800, Joseph Powers wrote:
While creating the HC Icon set, could you look into the following?
..
I changed the Windows Only code to match this behavior; however, I don't
have access to a Windows build system so the change is 1) un-tested
2) theoretically correct. Any testing would be great.
Cool :-) Hopefullly we'll get our nightly snapshot building working
soon, and the QA guys can have a bang on it.
It should now be save to remove all the HC versions of the icons from
all sets and start packaging the HC set as it's own theme.
Brilliant :-) I believe we're nearly there on that anyway, but no doubt
some residual cleanup is needed.
PS: I believe I've removed all the code dealing with loading HC version
of Icons. If no-one objects, I'll remove the task from the Easy-Hacks page.
Wonderful work ! :-) how does it feel ? - I'm thrilled to have had all
that crud removed, and please do hack it out of the wiki [ and add any
other easy tasks you stumbled upon while hacking around here :-]
Incidentally - we should prolly do some extra work in our backends to
allow the default icon theme to be specified per platform, and made to
match the native theme.
Do you mean something like in: clone/libs-gui/vcl/source/app/settings.cxx
ULONG StyleSettings::GetAutoSymbolsStyle() const
{
...
if( bCont )
{
if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( gnome ) ||
rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( windows ) )
nRet = STYLE_SYMBOLS_TANGO;
else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( kde ) )
nRet = STYLE_SYMBOLS_CRYSTAL;
else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( kde4 ) )
nRet = STYLE_SYMBOLS_OXYGEN;
}
}
We already seem to select a per-system default when the icon theme is set to
auto.
eg. in vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx we setup the color
schemes for gtk+ - but, AFAICS we don't detect the name of the system
theme and adapt to it.
By looking for the High Contrast.* theme names, we could pick a good
default - ditto selecting, oxygen or crystal or tango if the
system theme matches that: I -thought- we used to do that, but ... :-)
Anyhow - some great work here.
Thanks !
Michael.
--
michael.me...@novell.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Impress
Please disregard my Friday patch for Impress. Removing the Global High Contrast flag is going to require more work then the simple remove HC icons project is going to allow. We hard code too many UI items (text fonts, background color, border color, ...) which have to be modified when in HC mode. The correct fix for this would be: 1. Find all colors 2. Sort and standardize use. 3. Fix the Color Editor to include all the codes. 4. Replace all the hard coded entries to take values from the color chart. 5. Ship a HC and Normal color theme 6. Bonus points for getting the above to work with all the system color themes... I'm going to revert most of the Impress patch and then resubmit with only the Icon related changes. Joe P. PS: Removing the global flag did find a few odd cases of where Icon related code was hiding so it wasn't a complete loss. PS: In master, the text labels for the HC colors are missing. I'm going to see if I did that and see about getting the labels back in. I may end up asking someone with better GIT skills then me to help find the patch and see about getting it fixed. If I can't find it in GIT, I'll check the 3.3 branch and see if it has the labels and then just copy the code back into master. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] HC Cleanup
While creating the HC Icon set, could you look into the following? default_images/svx/source/svdraw cropmarkers.png - 2d icons for cropping cropmarkers2.png- 3d icons for cropping cropmarkersACC.png - HC icons for cropping markers.png - 2d icons for markers markers2.png- 3d icons for markers markersACC.png - HC icons for markers The ACC versions will need to be copied in the 2d 3d version in the HC set. I've removed the code referring to the ACC versions. -- Just to confuse people, I changed the Auto-Detect HC mode option to change the default theme to the High Contrast one. Yes, I know that when changing the OS back to a normal theme, I don't change LibO back to the old theme (we currently don't have a place to store the option). I changed the Windows Only code to match this behavior; however, I don't have access to a Windows build system so the change is 1) un-tested 2) theoretically correct. Any testing would be great. -- It should now be save to remove all the HC versions of the icons from all sets and start packaging the HC set as it's own theme. -- Joe P. PS: I believe I've removed all the code dealing with loading HC version of Icons. If no-one objects, I'll remove the task from the Easy-Hacks page. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Fix spaetz's change to framework
Plus a lot of trailing white space cleanup... image_count.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Icon/Image cleanup
On Nov 10, 2010, at 4:43 PM, Jan Holesovsky wrote: Hi Joseph, Michael Meeks píše v St 10. 11. 2010 v 09:20 +: Ok, I went ahead and did some high-contrast cleanup work on libs-core. I was able to delete massive amounts of code and configuration items. The main issue I'm having is the masking: Just got back, and started reading your patches; this is some really nice work :-) I love deleting huge gobs of mostly pointless code - that's great fun. Let me just double what Michael says - great stuff, thank you for that! I haven't played with the icons/images yet. That'll take work trying to figure out the build system (any volunteers?) So far, I've removed references for the following items: Oh - great list; I'll try to put some time this week into prodding the icon theme building code so we can start actually removing these from the default_images directly, and move them into a separate high-contrast theme one by one as we remove the need for them. The HC icon theme (images_hicontrast.zip) is actually generated from the default_images using solenv/bin/hicontrast-to-theme.pl; I suppose we could just run that script with slight modifications to actually git rm on the HC icons in default_images, an git add them in the new location? Or anything more is missing there? Regards, Kendy I have a script that generates the hicontrast theme with out the _h variants. The reason I haven't touched the icons yet is for safety reason. 1. If I generate the high-contrast theme, we'd still need to add the _h variants until the code is full removed. 2. I'd need to change the current build scripts to stop generating the high-contrast. 3. I'd need to modify the build scripts to package the now pre-existing high-contrast theme. Most of the above isn't an big issue. It's just that I'm not even halfway through removing the HC code. And since we've had all the extra icons for years; whats another month or so. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Broken Compile in oox/source/drawingml
I just did a new pull and build and came up with the following error: /Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx: In static member function 'static const com::sun::star::uno::Type cppu::UnoType template-parameter-1-1 ::get() [with T = int]': /Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:291: instantiated from 'const com::sun::star::uno::Type cppu::getTypeFavourUnsigned(const T*) [with T = int]' /Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/com/sun/star/uno/Any.hxx:57: instantiated from 'com::sun::star::uno::Any::Any(const T) [with T = int]' ../../inc/oox/helper/propertyset.hxx:163: instantiated from 'void oox::PropertySet::setProperty(sal_Int32, const Type) [with Type = int]' /Users/jpowers27/build/clone/filters/oox/source/drawingml/textparagraphproperties.cxx:432: instantiated from here /Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:270: error: call of overloaded 'cppu_detail_getUnoType(int*)' is ambiguous /Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:157: note: candidates are: const com::sun::star::uno::Type cppu::detail::cppu_detail_getUnoType(const sal_Int32*) near match /Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:162: note: const com::sun::star::uno::Type cppu::detail::cppu_detail_getUnoType(const sal_uInt32*) near match dmake: Error code 1, while making '../../unxmacxi.pro/slo/textparagraphproperties.obj' cat ../../unxmacxi.pro/misc/checkidl.txt Entering /Users/jpowers27/build/rawbuild/odk/util /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx: In member function 'void sd::DrawViewShell::GetMenuStateSel(SfxItemSet)': /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:293: warning: unused variable 'bSet' /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:295: error: 'bSet' was not declared in this scope /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx: At global scope: /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:307: error: expected unqualified-id before 'else' /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:479: error: expected unqualified-id before 'else' /Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:530: error: expected declaration before '}' token dmake: Error code 1, while making '../../../unxmacxi.pro/slo/drviewsj.obj' cd ../unxmacxi.pro/bin/odkcommon zip -urq ../odkcommon.zip . || ret=$?; if [[ $ret != 12 $ret != 1 ]] ; then exit $ret ; fi echo Nothing to update for zip /usr/bin/perl -w /Users/jpowers27/build/rawbuild/solenv/bin/cleanzip.pl ../unxmacxi.pro/bin/odkcommon.zip odk deliver Module 'odk' delivered successfully. 1 files copied, 3 files unchanged --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 65280 occurred while making /Users/jpowers27/build/rawbuild/oox/source/drawingml ERROR: error 65280 occurred while making /Users/jpowers27/build/rawbuild/sd/source/ui/view It's a little past my bed time; so I'm hoping someone else will fix this before I get up tomorrow :) Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] High-Contrast Cleanup
Man, you forget to delete two lines of code and someone complains...
Sorry about that, (julien, I hope this makes you happy).
Joe P.
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index 6b72567..ec222b0 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -382,8 +382,6 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow(
svt::ToolboxController rContr
, maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) )
, msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( .uno:FontworkAlignment )
)
{
-bool bHighContrast =
GetSettings().GetStyleSettings().GetHighContrastMode();
-
SetHelpId( HID_POPUP_FONTWORK_ALIGN );
SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) );
@@ -439,8 +437,6 @@ void FontWorkAlignmentWindow::DataChanged( const
DataChangedEvent rDCEvt )
if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ( rDCEvt.GetFlags()
SETTINGS_STYLE ) )
{
-bool bHighContrast =
GetSettings().GetStyleSettings().GetHighContrastMode();
-
appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT) ), maImgAlgin1 );
appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 );
appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 );
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Mac OS X Build issues.
I'm not sure why this started by the following patch fixes the issue. 0001-Fix-build-issues.patch Description: Binary data Not sure if this is the correct patch (suggested by LeMoyne, I wasn't sure if I should fix the pl or fix the inputs...), but it builds and runs on Mac OS X. Form the file name, I'm assuming it doesn't run on the other systems. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Macro Cleanup in UNO
On Oct 31, 2010, at 10:40 PM, Norbert Thiebaud wrote: On Sun, Oct 31, 2010 at 11:44 PM, Joseph Powers jpower...@cox.net wrote: [...] The defaults for the classes where defined in the header (good); however, they used generic names like DEFAULT_VALUE, FREESPACE, … (bad). I went ahead and renamed them by prefixing CLASSNAME_ to the start of them. Someone already found this issue since I found some #undefs before #defines so the values could be changed. Is there any reason why you didn't apply the same rule for DEFAULT_BUTTONLABEL (in progessmonitor.hxx) ? UnoControls/source/controls/progressmonitor.cxx:m_xButton-setLabel ( OUString::createFromAscii( DEFAULT_BUTTONLABEL UnoControls/source/inc/progressmonitor.hxx:#define DEFAULT_BUTTONLABEL Are the only two reference in the entire project to it. I guess I was a little lazy towards the end... I know of now reason it couldn't be changed. [...] Joe P. PS: I left the CreateFromASCII() work to the other team. I will note that anything CreateFromASCII( ALLUPPERCASE ) is a constant and can be optimize (check the header file of the same name). PS: Patch released under LGPL 3+ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Build Issue on Mac OS X
Ok, I need a build system expert:
Making:test_pathutils.dylib
illegal combination shl/OOO/NONE at
/Users/jpowers27/build/build/libreoffice-3.2.99.2/solenv/bin/macosx-change-install-names.pl
line 54, IN line 5.
dmake: Error code 9, while making '../unxmacxi.pro/lib/test_pathutils.dylib'
dmake: '../unxmacxi.pro/lib/test_pathutils.dylib' removed.
Ok, the perl script is:
use lib ($ENV{SOLARENV}/bin/modules);
use macosxotoolhelper;
sub action($$$)
{
my %action =
('app/UREBIN/URELIB' = '@executable_path/../lib',
'app/OOO/URELIB' = '@executable_path/../ure-link/lib',
'app/OOO/OOO' = '@executable_path',
'app/SDK/URELIB' = '@executable_path/../../ure-link/lib',
'app/BRAND/URELIB' = '@executable_path/../basis-link/ure-link/lib',
'app/BRAND/OOO' = '@executable_path/../basis-link/program',
'app/NONE/URELIB' = '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' = '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' = '@__VIA_LIBRARY_PATH__',
'shl/URELIB/URELIB' = '@loader_path',
'shl/OOO/URELIB' = '@loader_path/../ure-link/lib',
'shl/OOO/OOO' = '@loader_path',
'shl/OXT/URELIB' = '@executable_path/urelibs',
'shl/BOXT/URELIB' = '@executable_path/urelibs',
'shl/BOXT/OOO' = '@loader_path/../../../basis-link/program',
'shl/NONE/URELIB' = '@__VIA_LIBRARY_PATH__',
'shl/NONE/OOO' = '@__VIA_LIBRARY_PATH__',
'shl/NONE/NONE' = '@__VIA_LIBRARY_PATH__');
my ($type, $loc1, $loc2) = @_;
my $act = $action{$type/$loc1/$loc2};
die illegal combination $type/$loc1/$loc2 unless defined $act;
return $act;
}
@ARGV == 3 || @ARGV = 2 $ARGV[0] eq extshl or die
'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE filepath*';
$type = shift @ARGV;
$loc = shift @ARGV;
if ($type eq extshl)
{
$type = shl;
my $change = ;
my %inames;
foreach $file (@ARGV)
{
my $iname = otoolD($file);
(defined $iname ? $iname : $file . \n) =~ m'^(.*?([^/]+))\n$' or
die unexpected otool -D output;
$change .= -change $1 . action($type, $loc, $loc) . /$2;
$inames{$file} = $2;
}
foreach $file (@ARGV)
{
my $call = install_name_tool$change -id
\...@__$loc/$inames{$file}
$file;
system($call) == 0 or die cannot $call;
}
}
foreach $file (@ARGV)
{
my $call = otool -L $file;
open(IN, -|, $call) or die cannot $call;
my $change = ;
while (IN)
{
$change .= -change $1 . action($type, $loc, $2) . $3
if m'^\s*(@_{50}([^/]+)(/.+)) \(compatibility version
\d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$';
}
close(IN);
if ($change ne )
{
$call = install_name_tool$change $file;
system($call) == 0 or die cannot $call;
}
}
*** end of script ***
My perl is good enough (I've never done any perl programing; ie: it's an
educated guess), to determine the issue is the line in red above. Other then
that I can't tell where the parameters are coming from (are they passed in or
generated by something I don't see).
This just started about 2 days ago.
Thanks,
Joe P.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Icons
Andrew, I'm a little crazy, but I want to work on the icon issues. I'm a programmer, so I've been looking at things from the other side... Currently the system is a mess, the top level determines if if we're in high-contrast mode or not and then requests the correct image. On top of this, we have both themed and un-themed icons; thus, I can't just kill the high-contrast checks. From your earlier e-mails, you've said that each theme has both standard icons and high-contrast icons; this has to change. However, I'm stuck trying to figure out how the code knows which icon file it's requesting. The un-themed icons in chart2 are easy to tack since I found the mapping files; however, I'm having issues with the themed icons. I believe all the themes should be located the /artwork directory and we'll need to create a system for building/packaging them for inclusion into the project. We'll also need to determine a directory to house the installed themes. The current system of themes being hard coded into the build system needs to change; the users should be able to just drop a theme package and have the them auto-reconized on the change theme dialog. I'm open to suggestions from any of the other developers. I'm also in need of guidance in under standing the current icon packaging system. As far as I can determine the biggest savings would be to do the changes in this order: 1. Remove the High-Contrast check from the themed icons. a) This should cut the themes in about half. b) Reduce a lot of code over head. 2. Move the un-themed icons in to the default themes. a) This only removes some redundant code paths for retrieving icons. b) Removes the last of the High-Contrast checks. c) Will need to verify that the missing icon fall-back code actually works. 3. Make themes discoverable. a) No real savings, it's mostly a coolness factor. Plus it gives the graphics designers something to do so they leave the programmers alone. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Quick Patch to Fix sfx2 compile error
Not sure why no one else noticed this... com::sun::star:: was missing on two entries sfx2.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Address Books
It looks like someone already connected Base to Apple's Address Book (no bonus points for me) On my mac, I can't get the Mozilla Address Book driver to work. 1. Preferences - LibreOffice Base - Connections shows that com.sun.star.comp.sdbc.MozabDriver is installed. 2. Trying to open the abook.mab file as an existing database fails (it doesn't recognize the file as being a database). 3. The connect to an existing database drop down doesn't include the Moz Driver. I'm working on trying to isolate all the Moz Driver code out of the seamonkey source so it can be build with seamonkey disabled. I'd also like to update the code something a little more modern like v2ish of seamonkey (I'm going to look into Thunderbird's code and see if it uses seamonkey's address book code). Also, does anyone know of any documentation on how the connectors work? (libs-core - connectivity - source - drivers) Any pointers on any of the above would be nice. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Address Books
On Oct 20, 2010, at 8:05 AM, Caolán McNamara wrote: On Wed, 2010-10-20 at 06:09 -0700, Joseph Powers wrote: It looks like someone already connected Base to Apple's Address Book (no bonus points for me) On my mac, I can't get the Mozilla Address Book driver to work. Hmm, see connectivity/source/drivers/mozab/makefile.mk Apparently on the mac its not built if I'm reading that right Which explains why the connection couldn't find the libraries. Preferences - LibreOffice Base - Connections shows that com.sun.star.comp.sdbc.MozabDriver is installed. probably should find out where that's coming from then This could be caused by the fact that the Connection was compiled into the program. C. So the short answer is: If the connection is compiled, you'll see the driver listed; however, if the external driver isn't found you can't using the connection and no error is given. Thanks for the help... now to see if I can force it to compile so I can play with it :) I think on Mac they disabled MozAB and use AppleAB instead. Which is ok, but we should leave both enabled. Mail.app is very limited so it's quite likely that someone may use Thunderbird instead. In which case we should allow the users to select the preferred address book. (side note: thunderbird also has an option to use the AppleAB by default) Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Fwd: CLang++ Analysis
Begin forwarded message: From: Joseph Powers jpower...@cox.net Date: October 18, 2010 7:32:55 AM PDT To: libreoffice-requ...@lists.freedesktop.org Subject: CLang++ Analysis The build process is easy: Download the CLang analyzer Unpack it somewhere Add somewhere to your path. I unpacked it in ~/checker; thus: export $PATH:~/checker scan-build --use-cc=gcc-4.0 --use-c++=g++-4.0 -o ~/output_directory -v ./autogen ... scan-build --use-cc=gcc-4.0 --use-c++=g++-4.0 -o ~/output_directory -v ./download scan-build --use-cc=gcc-4.0 --use-c++=g++-4.0 -o ~/output_directory -v make The --use-cc --use-c++ are required for MaC OS to support building for 10.4. I placed a copy of my build results at: http://jpowers.me Joe P ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Mac OS X 10.6.4 Build
Ok, I got a build that seams to work... I'm attaching my instructions for any other brave sole (can you find a home for it on the build instructions site?). The build process default build process has some issues: 1. I had to install libgettext in order to build several libraries. This causes the build of libhunspell to fail because it looks like it's trying to compile against the gettext directory adjacent to the hunspell directories. Since gettext wasn't built, the files are missing. I had to install libhunspell and include the --with-system-hunspell to work around this issue. 2. instsetoo_native fails due to a missing libjpipe. The workaround for this is to just remark out the code related to libjpipe. I was reading that this may be caused by using the 64bit java VM. This needs further research. 3. The make install fails with a Failed to generage package file lists. This doesn't seam to affect the running of the installed program; however, it does need further review. Joe P. PS: The attached document was created by TextEdit (Apple's version of Notepad/Write) as an .ODT file and then edited and saved using my new version of LibreOffice :) Mac OS X 10.6.4 Build Instructions.odt Description: application/vnd.oasis.opendocument.text PS: We need to do something about the ICON's. The file system ICON for documents is the OO ICON with the birds. Also, the application ICON is also the OO bird ICON. It looks like I may have installed OO on my computer instead of LibO. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OS X Build
On my 10.6.4 machine, I had to install the following to get things to build: autoconf2.68 automake1.11.1 coreutils 8.5 gettext 0.18.1.1 git 1.7.2.3 glib2.26.0 gmp 5.0.1 libIDL 0.8.14 libiconv1.13.1 - I was having some issues with the base one not be recognized as GNU libidn 1.19 libxml2 2.7.7 - Not sure why configure didn't find the base one (maybe because it's in Framework which is mac only) libxslt 1.1.26 m4 1.4.15 pkg-config 0.25 wget1.12 I wouldn't worry too much about the gcp issue. On a side note, I now hate MacPorts. I'm using a MacPro and installing -i386 fails on about half of the above installs. -x86_64 fails on about half (and if you don't include it, this is the default). The +universal option again fails on about half of them. I ended up just downloading the base .tar.gz files and building them all from scratch. Most of them allow you to just set the compiler flags to -arch i386 -arch x86_64 to automatically build fat versions. Two of them required building one -arch, doing the install, and the building the 2nd -arch, and then manually create the fat version. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
