[Libreoffice-commits] .: 3 commits - desktop/Library_sofficeapp.mk desktop/Module_desktop.mk sal/osl
desktop/Library_sofficeapp.mk |8 desktop/Module_desktop.mk | 23 ++- sal/osl/unx/module.c |1 + 3 files changed, 19 insertions(+), 13 deletions(-) New commits: commit 530a76c8effedc921cbf70293b6730620ec2fef2 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Nov 16 11:06:57 2011 +0200 Reduce what we build here for non-DESKTOP OSes diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 2b137f6..b9cc758 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -39,6 +39,19 @@ $(eval $(call gb_Module_add_targets,desktop,\ AllLangResTarget_deployment \ AllLangResTarget_deploymentgui \ AllLangResTarget_dkt \ +Library_offacc \ +Library_sofficeapp \ +Library_spl \ +Library_unopkgapp \ +Package_branding \ +Package_intro \ +Zip_brand \ +Zip_brand_dev \ +Zip_shell \ +)) + +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,desktop,\ Executable_soffice.bin \ Executable_unopkg.bin \ Library_deployment \ @@ -46,22 +59,14 @@ $(eval $(call gb_Module_add_targets,desktop,\ Library_deploymentmisc \ Library_migrationoo2 \ Library_migrationoo3 \ -Library_offacc \ -Library_sofficeapp \ -Library_spl \ -Library_unopkgapp \ -Package_branding \ -Package_intro \ Package_scripts \ Pagein_calc \ Pagein_common \ Pagein_draw \ Pagein_impress \ Pagein_writer \ -Zip_brand \ -Zip_brand_dev \ -Zip_shell \ )) +endif ifeq ($(OS),WNT) commit 44329b4cacdb73a1977645e974bc009680b1b9c3 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Nov 16 10:50:36 2011 +0200 What we want is the filter function, not firstword diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index f9e9839..15ac285 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -41,10 +41,10 @@ $(eval $(call gb_Library_add_api,sofficeapp,\ $(eval $(call gb_Library_add_defs,sofficeapp,\ -DDESKTOP_DLLIMPLEMENTATION \ -$(if $(firstword TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \ -$(if $(firstword WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \ -$(if $(firstword aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \ -$(if $(firstword TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ +$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \ +$(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \ +$(if $(filter aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \ +$(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ )) $(eval $(call gb_Library_set_include,sofficeapp,\ commit ec64673e61fabc80ec5e4fa60d78d33bf537eb4f Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Nov 16 10:02:59 2011 +0200 WaE: Unused parameter diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c index c0ee837..824a629 100644 --- a/sal/osl/unx/module.c +++ b/sal/osl/unx/module.c @@ -151,6 +151,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR #ifdef ANDROID void *(*lo_dlopen)(const char *) = dlsym(RTLD_DEFAULT, lo_dlopen); void *pLib; +(void) nRtldMode; OSL_ASSERT(lo_dlopen != NULL); pLib = (*lo_dlopen)(pModuleName); #else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libexttextcat/makefile.mk
libexttextcat/makefile.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 34578b7c2706d2cca95eeb266aeb0498078bb55a Author: Michael Stahl mst...@redhat.com Date: Wed Nov 16 10:56:37 2011 +0100 libexttextcat: conflict in 69b04c22986b03c675cf4925f76721190aa5ba82 diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk index 7633a0b..f4f5383 100644 --- a/libexttextcat/makefile.mk +++ b/libexttextcat/makefile.mk @@ -47,9 +47,7 @@ all: TARFILE_NAME=libexttextcat-3.2.0 TARFILE_MD5=e1c178b18f130b40494561f02bc1a948 TARFILE_ROOTDIR=libexttextcat-3.2.0 -PATCH_FILES=libexttextcat-3.2.0-visibility.patch - -PATCH_FILES = android.patch +PATCH_FILES=libexttextcat-3.2.0-visibility.patch android.patch .IF $(GUI)==UNX .IF $(HAVE_GCC_VISIBILITY_FEATURE) == TRUE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry sw/source
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu |
4 -
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |
4 -
sw/source/ui/wrtsh/navmgr.cxx|
29 ++
3 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit c269a684f12c331a5d90a36e50a6275b072886f8
Author: Tim Hardeck thard...@suse.com
Date: Tue Nov 15 20:42:00 2011 +0100
Hide Navigation toolbar until needed
Hide Navigation toolbar until there is something to navigate.
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index e0a1085..465244a 100644
---
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -660,7 +660,7 @@
valuetrue/value
/prop
prop oor:name=Visible oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
prop oor:name=UIName oor:type=xs:string
value xml:lang=en-USNavigation/value
@@ -669,7 +669,7 @@
valuefalse/value
/prop
prop oor:name=ContextSensitive oor:type=xs:boolean
-valuefalse/value
+valuetrue/value
/prop
/node
/node
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 455b97e..3bf5e2f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -666,7 +666,7 @@
valuetrue/value
/prop
prop oor:name=Visible oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
prop oor:name=UIName oor:type=xs:string
value xml:lang=en-USNavigation/value
@@ -675,7 +675,7 @@
valuefalse/value
/prop
prop oor:name=ContextSensitive oor:type=xs:boolean
-valuefalse/value
+valuetrue/value
/prop
/node
/node
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index 2ef5b17..f465463 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -35,6 +35,10 @@
#include cmdid.h
#include view.hxx
+#include com/sun/star/frame/XLayoutManager.hpp
+
+namespace css = ::com::sun::star;
+
/**
* If SMART is defined, the navigation history has recency with temporal
ordering enhancement,
* as described on http://zing.ncsl.nist.gov/hfweb/proceedings/greenberg/
@@ -219,6 +223,31 @@ bool SwNavigationMgr::addEntry(const SwPosition rPos) {
_pMyShell-GetView().GetViewFrame()-GetBindings().Invalidate(FN_NAVIGATION_BACK);
if (bForwardWasEnabled)
_pMyShell-GetView().GetViewFrame()-GetBindings().Invalidate(FN_NAVIGATION_FORWARD);
+
+/* show the Navigation toolbar */
+css::uno::Reference css::frame::XFrame xFrame =
_pMyShell-GetView().GetViewFrame()-GetFrame().GetFrameInterface();
+if (xFrame.is())
+{
+css::uno::Reference css::beans::XPropertySet xPropSet(xFrame,
css::uno::UNO_QUERY);
+if (xPropSet.is())
+{
+css::uno::Reference css::frame::XLayoutManager xLayoutManager;
+css::uno::Any aValue = xPropSet-getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LayoutManager ) ) );
+
+aValue = xLayoutManager;
+if (xLayoutManager.is())
+{
+const ::rtl::OUString sResourceURL(
RTL_CONSTASCII_USTRINGPARAM( private:resource/toolbar/navigationobjectbar ) );
+css::uno::Reference css::ui::XUIElement xUIElement =
xLayoutManager-getElement(sResourceURL);
+if (!xUIElement.is())
+{
+xLayoutManager-createElement( sResourceURL );
+xLayoutManager-showElement( sResourceURL );
+}
+}
+}
+}
+
return bRet;
}
/* 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] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit bec1bff6afac35c7064aa4b561eff106aeda383e Author: Miklos Vajna vmik...@frugalware.org Date: Wed Nov 16 11:08:06 2011 +0100 Related i#113308: fix import of RTF table rows having no cells diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d88c199..a0a5a76 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1395,7 +1395,6 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) m_aStates.top().aTableCellsAttributes.pop_front(); replayBuffer(m_aTableBuffer); } -m_aStates.top().nCells = 0; m_aStates.top().aTableCellSprms = m_aDefaultState.aTableCellSprms; m_aStates.top().aTableCellAttributes = m_aDefaultState.aTableCellAttributes; @@ -1413,7 +1412,8 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) NS_ooxml::LN_CT_TblPrBase_tblW, NS_ooxml::LN_CT_TblWidth_w, pWValue); RTFValue::Pointer_t pRowValue(new RTFValue(1)); - m_aStates.top().aTableRowSprms-push_back(make_pair(NS_sprm::LN_PRow, pRowValue)); +if (m_aStates.top().nCells 0) + m_aStates.top().aTableRowSprms-push_back(make_pair(NS_sprm::LN_PRow, pRowValue)); writerfilter::ReferenceProperties::Pointer_t const pTableRowProperties( new RTFReferenceProperties(m_aStates.top().aTableRowAttributes, m_aStates.top().aTableRowSprms) ); @@ -1422,6 +1422,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) tableBreak(); m_bNeedPap = true; m_aTableBuffer.clear(); +m_aStates.top().nCells = 0; m_aStates.top().aTableCellsSprms.clear(); m_aStates.top().aTableCellsAttributes.clear(); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e585a1725290e81940bafab3bf80d594fa70666
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 16 11:25:42 2011 +0100
Fix variable name in make_installer
Seems I mis-copypasted the name here - mac dev builds were not using
the new DS_Store at any rate.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 3fa31f5..6f3ec4a 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -487,7 +487,7 @@ if (( ! $allvariableshashref-{'XPDINSTALLER'} ) || ( !
$installer::globals::isx
if ( $installer::globals::languagepack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::helppack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
-if ( $allvariables-{'PRODUCTNAME'} eq LibO-dev ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
+if ( $allvariableshashref-{'PRODUCTNAME'} eq LibO-dev ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::patch ) {
installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productscpactions1b.log,
$scpactionsinproductarrayref); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c2439ecdd4ad42c4a23cba12611d5bfcdcd5e165 Author: Miklos Vajna vmik...@frugalware.org Date: Wed Nov 16 11:59:05 2011 +0100 Related: i#113308 null pointer check for the unit test diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 61add03..e6e9ad0 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2835,10 +2835,11 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_NUMCHARS: case FIELD_NUMWORDS: case FIELD_NUMPAGES: +if (xFieldProperties.is()) xFieldProperties-setPropertyValue( rPropNameSupplier.GetName(PROP_NUMBERING_TYPE), uno::makeAny( lcl_ParseNumberingType(pContext-GetCommand()) )); -break; +break; } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 84da4113b4ec80cccd5916bf1289564837d6d5f9
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 16 12:37:04 2011 +0100
Fix slideshow crasher
Recursive event loop killed SlideshowImpl object under my hands -
make it stay until we pop out of callstack again.
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 867e3bd..7de8329 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1873,6 +1873,9 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG )
IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG )
{
+// prevent me from deletion when recursing (App::Reschedule does)
+const rtl::ReferenceSlideshowImpl this_(this);
+
Application::EnableNoYieldMode(false);
Application::RemovePostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
Application::Reschedule(true); // fix for fdo#32861 - process
@@ -1888,7 +1891,7 @@ IMPL_LINK( SlideshowImpl, PostYieldListener, void*,
EMPTYARG )
sal_Int32 SlideshowImpl::updateSlideShow (void)
{
-// doing some nMagic
+// prevent me from deletion when recursing (App::EnableYieldMode does)
const rtl::ReferenceSlideshowImpl this_(this);
Reference XSlideShow xShow( mxShow );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/_tg_shl.mk | 180 +- solenv/inc/tg_shl.mk | 18 - 2 files changed, 22 insertions(+), 176 deletions(-) New commits: commit 2d19e9bb07ccff3134f855812dddfda5c07b1fe4 Author: Jan Holesovsky ke...@suse.cz Date: Wed Nov 16 14:17:03 2011 +0100 Kill one usage of chrel.sed to fix build. diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index f7aa241..7c537be 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -225,19 +225,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls $(SHL1TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL1USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL1LIBS)!= -SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst -SHL1LINKLISTPARAM=@$(SHL1LINKLIST) -$(SHL1LINKLIST) : $(SHL1LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL1LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL1USE_EXPORTS)==name $(MISC)/%linkinc.ls: @echo . $@ @@ -254,8 +241,7 @@ $(SHL1TARGETN) : \ $(USE_SHL1DEF)\ $(USE_SHL1VERSIONMAP)\ $(SHL1RES)\ -$(SHL1DEPN) \ -$(SHL1LINKLIST) +$(SHL1DEPN) @echo Making:$(@:f) .IF $(GUI) == WNT .IF $(SHL1DEFAULTRES)!= @@ -395,7 +381,7 @@ $(SHL1TARGETN) : \ $(USE_1IMPLIB) \ $(STDOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ)) \ -$(SHL1LINKLISTPARAM) \ +$(SHL1LIBS) \ @$(mktmp $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ @@ -729,19 +715,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls $(SHL2TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL2USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL2LIBS)!= -SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst -SHL2LINKLISTPARAM=@$(SHL2LINKLIST) -$(SHL2LINKLIST) : $(SHL2LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL2LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL2USE_EXPORTS)==name $(MISC)/%linkinc.ls: @echo . $@ @@ -758,8 +731,7 @@ $(SHL2TARGETN) : \ $(USE_SHL2DEF)\ $(USE_SHL2VERSIONMAP)\ $(SHL2RES)\ -$(SHL2DEPN) \ -$(SHL2LINKLIST) +$(SHL2DEPN) @echo Making:$(@:f) .IF $(GUI) == WNT .IF $(SHL2DEFAULTRES)!= @@ -899,7 +871,7 @@ $(SHL2TARGETN) : \ $(USE_2IMPLIB) \ $(STDOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ)) \ -$(SHL2LINKLISTPARAM) \ +$(SHL2LIBS) \ @$(mktmp $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ @@ -1233,19 +1205,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls $(SHL3TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL3USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL3LIBS)!= -SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst -SHL3LINKLISTPARAM=@$(SHL3LINKLIST) -$(SHL3LINKLIST) : $(SHL3LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL3LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL3USE_EXPORTS)==name $(MISC)/%linkinc.ls: @echo . $@ @@ -1262,8 +1221,7 @@ $(SHL3TARGETN) : \ $(USE_SHL3DEF)\ $(USE_SHL3VERSIONMAP)\ $(SHL3RES)\ -$(SHL3DEPN) \ -$(SHL3LINKLIST) +$(SHL3DEPN) @echo Making:$(@:f) .IF $(GUI) == WNT .IF $(SHL3DEFAULTRES)!= @@ -1403,7 +1361,7 @@ $(SHL3TARGETN) : \ $(USE_3IMPLIB) \ $(STDOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ)) \ -$(SHL3LINKLISTPARAM) \ +$(SHL3LIBS) \ @$(mktmp $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ @@ -1737,19 +1695,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls $(SHL4TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL4USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL4LIBS)!= -SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst -SHL4LINKLISTPARAM=@$(SHL4LINKLIST) -$(SHL4LINKLIST) : $(SHL4LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL4LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL4USE_EXPORTS)==name
[Libreoffice-commits] .: 7 commits - connectivity/source .gitignore idl/inc sc/source sfx2/inc sfx2/source starmath/source sw/source tools/inc tools/Package_inc.mk tools/source unusedcode.easy vcl/inc
.gitignore |4 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |6 connectivity/source/drivers/evoab2/NDebug.cxx|2 connectivity/source/drivers/evoab2/NDebug.hxx|2 connectivity/source/drivers/evoab2/NStatement.cxx|8 - idl/inc/bastype.hxx |1 sc/source/core/inc/core_pch.hxx |1 sc/source/filter/inc/filt_pch.hxx|1 sc/source/ui/inc/ui_pch.hxx |1 sfx2/inc/pch/precompiled_sfx2.hxx|1 sfx2/inc/sfx2/shell.hxx |1 sfx2/source/appl/appserv.cxx |3 sfx2/source/appl/sfxpicklist.cxx |6 sfx2/source/dialog/filedlghelper.cxx | 14 - sfx2/source/dialog/taskpane.cxx | 10 - sfx2/source/doc/docfac.cxx |4 sfx2/source/doc/objuno.cxx | 14 - sfx2/source/view/viewfac.cxx |2 sfx2/source/view/viewfrm.cxx | 10 - sfx2/source/view/viewsh.cxx |4 starmath/source/math_pch.cxx |1 sw/source/core/crsr/bookmrk.cxx | 50 -- sw/source/filter/ww8/docxattributeoutput.cxx |2 sw/source/filter/ww8/docxexport.cxx | 18 +- sw/source/ui/vba/vbacolumn.cxx |2 sw/source/ui/vba/vbarow.cxx |4 tools/Package_inc.mk |1 tools/inc/tools/unqid.hxx| 110 --- tools/source/memtools/unqidx.cxx | 95 unusedcode.easy | 18 ++ vcl/inc/svdata.hxx |1 vcl/inc/vcl/svapp.hxx|3 vcl/source/app/svapp.cxx | 11 - vcl/source/app/svmain.cxx|6 34 files changed, 105 insertions(+), 312 deletions(-) New commits: commit 72c439a7bd01f7e0571df81f584d71d3a8f48b18 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 16 13:23:36 2011 + update unused list diff --git a/unusedcode.easy b/unusedcode.easy index 08b9060..c148242 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -336,6 +336,8 @@ SbiImage::Load(SvStream) SbiIoSystem::NextChannel() SbiRuntime::GetParams() SbiSymPool::Clear() +SbxDecimal::SbxDecimal() +SbxDecimal::getByte(unsigned char) SbxDecimal::getChar(unsigned short) SbxDecimal::getInt(int) SbxDecimal::getLong(int) @@ -347,6 +349,7 @@ SbxDecimal::getUShort(unsigned short) SbxDecimal::setShort(short) SbxDecimal::setString(rtl::OUString*) SbxDecimal::setUShort(unsigned short) +SbxValue::PutDecimal(SbxDecimal*) ScAddInAsyncs::Insert(ScAddInAsync* const, unsigned short) ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short) ScAddInAsyncs::Insert(ScAddInAsyncs const*, unsigned short, unsigned short) @@ -391,7 +394,6 @@ ScDdeLink::ResetValue() ScDocRowHeightUpdater::TabRanges::TabRanges() ScDocument::ValidNewTabName(std::__debug::vectorrtl::OUString, std::allocatorrtl::OUString const) const ScFilterDetect::impl_createFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const) -ScFiltersTest::testPassword() ScFormulaCell::IsRangeNameInUse(unsigned short) const ScFormulaCell::ScFormulaCell() ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short) @@ -407,6 +409,7 @@ ScJobSetup::ScJobSetup(SfxPrinter*) ScLeftFooterEditPage::GetRanges() ScLeftHeaderEditPage::GetRanges() ScMatrix::CalcOffset(unsigned long, unsigned long) const +ScModule::Find1RefWindow(Window*) ScMultiTextWnd::GetLineCount() ScMyCellInfo::ScMyCellInfo() ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport) @@ -1485,6 +1488,9 @@ binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, binfilter::CharPosArray::Replace(int const, unsigned short) binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short) binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const, void*), void*) +binfilter::Container::GetCurObject() const +binfilter::Container::Insert(void*) +binfilter::Container::Remove() binfilter::Dictionary::~Dictionary() binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short) binfilter::GeometryIndexValueBucketMemArr::Replace(char const*, unsigned short) @@ -1752,6 +1758,9 @@
[Libreoffice-commits] .: 5 commits - instsetoo_native/util oowintool post_download.in scp2/source solenv/bin
instsetoo_native/util/openoffice.lst |4 -
oowintool | 20 +
post_download.in | 11 +
scp2/source/ooo/vc_redist.scp | 24 +++
solenv/bin/modules/installer/globals.pm |2
solenv/bin/modules/installer/windows/msiglobal.pm | 45 +-
6 files changed, 102 insertions(+), 4 deletions(-)
New commits:
commit 1b6d2c7f465cb1249e33d9e873f11756be634a3a
Author: Andras Timar ati...@suse.com
Date: Wed Nov 16 12:03:50 2011 +0100
fix SDK database version number
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 83a53b2..22a5227 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -293,7 +293,7 @@ LibreOffice_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
-DATABASENAME libreoffice33sdk
+DATABASENAME libreoffice35sdk
NO_README_IN_ROOTDIR 1
LICENSENAME LGPL
IGNOREDIRECTORYLAYER 1
@@ -345,7 +345,7 @@ LibreOffice_Dev_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
-DATABASENAME libreoffice33devsdk
+DATABASENAME libreoffice35devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME LGPL
IGNOREDIRECTORYLAYER 1
commit ee53055d7dd33a886702f3a5ebc2e304dc32aff4
Author: Andras Timar ati...@suse.com
Date: Wed Nov 16 11:43:07 2011 +0100
merge transforms to msi as substorages and update summary information
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 7c31eff..082afb2 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -981,6 +981,15 @@ sub create_transforms
installer::logger::include_header_into_logfile(Creating Transforms);
my $msitran = msitran.exe;# Has to be in the path
+my $msidb = msidb.exe;# Has to be in the path
+my $msiinfo = msiinfo.exe;# Has to be in the path
+
+my $from = cwd();
+
+my $architecture = Intel;
+if (( $allvariableshashref-{'64BITPRODUCT'} ) (
$allvariableshashref-{'64BITPRODUCT'} == 1 )) { $architecture = x64; }
+
+my $templatevalue = \ . $architecture . ;1033;
$installdir = installer::converter::make_path_conform($installdir);
@@ -1003,7 +1012,8 @@ sub create_transforms
my $referencedbname = get_msidatabasename($allvariableshashref,
$onelanguage);
$referencedbname = $installdir . $installer::globals::separator .
$referencedbname;
-my $transformfile = $installdir . $installer::globals::separator .
trans_ . $onelanguage . .mst;
+my $windowslanguage =
installer::windows::language::get_windows_language($onelanguage);
+my $transformfile = $installdir . $installer::globals::separator .
$windowslanguage;
my $systemcall = $msitran . . -g . $basedbname . .
$referencedbname . . $transformfile . . $errorhandling;
@@ -1098,6 +1108,39 @@ sub create_transforms
push( @installer::globals::logfileinfo, $infoline);
installer::exiter::exit_program($infoline, create_transforms);
}
+
+chdir($installdir);
+$systemcall = $msidb . . -d . $basedbname . -r .
$windowslanguage;
+system($systemcall);
+chdir($from);
+unlink($transformfile);
+
+$infoline = Systemcall: $systemcall\n;
+push( @installer::globals::logfileinfo, $infoline);
+
+if ( $windowslanguage ne '1033')
+{
+$templatevalue = $templatevalue . , . $windowslanguage;
+}
+}
+
+$templatevalue = $templatevalue . \; # adding
ending ''
+$systemcall = $msiinfo . . $basedbname . -p . $templatevalue;
+
+$returnvalue = system($systemcall);
+
+$infoline = Systemcall: $systemcall\n;
+push( @installer::globals::logfileinfo, $infoline);
+
+if ($returnvalue)
+{
+$infoline = ERROR: Could not execute $msiinfo!\n;
+push( @installer::globals::logfileinfo, $infoline);
+}
+else
+{
+$infoline = Success: Executed $msiinfo successfully!\n;
+push( @installer::globals::logfileinfo, $infoline);
}
}
commit fa3495bfdaa10569580f041a6b8bd1c2fc51c0ff
Author: Andras Timar ati...@suse.com
Date: Fri Oct 21 10:36:45 2011 +0200
add merge modules to scp2
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 5c5c557..c4989a9 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -41,4 +41,28 @@ ScpAction scp_Copy_vcredist_x64
Subdir = redist;
End
+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
+Feature = gm_Root;
+Name =
[Libreoffice-commits] .: 2 commits - basctl/inc basctl/sdi basctl/source basctl/uiconfig officecfg/registry sfx2/inc sfx2/sdi starmath/inc starmath/source
basctl/inc/basidesh.hrc |6
basctl/sdi/baside.sdi |6
basctl/source/basicide/basides1.cxx | 30
+++
basctl/source/basicide/basidesh.src |4
basctl/source/basicide/moduldl2.cxx | 35
+++
basctl/source/basicide/moduldlg.hxx | 12 +
basctl/source/basicide/moduldlg.src | 38
basctl/uiconfig/basicide/menubar/menubar.xml |1
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu|5
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |5
sfx2/inc/sfx2/sfxsids.hrc |3
sfx2/sdi/sfx.sdi | 24 ++
starmath/inc/caret.hxx|2
starmath/inc/cursor.hxx |5
starmath/inc/node.hxx |7
starmath/source/cursor.cxx| 89
++
starmath/source/node.cxx | 15 +
starmath/source/view.cxx |8
18 files changed, 290 insertions(+), 5 deletions(-)
New commits:
commit 73d3c9504a479e62126d1e7a1766173370603aa1
Author: Noel Power noel.po...@novell.com
Date: Wed Nov 16 14:53:38 2011 +
add new 'Goto Line' menu item to Basic IDE
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index f3a1e64..9e5ccb2 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -169,6 +169,12 @@
#define RID_STR_NORMAL_MODULES ( RID_BASICIDE_START + 120 )
#define RID_STR_CLASS_MODULES ( RID_BASICIDE_START + 121 )
+
+#define RID_DLG_GOTOLINE( RID_BASICIDE_START + 122 )
+#define RID_FT_LINE ( RID_BASICIDE_START + 123 )
+#define RID_ED_LINE ( RID_BASICIDE_START + 124 )
+#define RID_STR_GETLINE ( RID_BASICIDE_START + 125 )
+
#endif // _SVX_NOIDERESIDS
#endif // _BASIDESH_HRC
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index f40e239..37b2f08 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -116,6 +116,12 @@ shell BasicIDEShell
StateMethod = GetState;
]
+SID_GOTOLINE
+[
+ExecMethod = ExecuteCurrent;
+StateMethod = GetState;
+]
+
FID_SEARCH_NOW
[
ExecMethod = ExecuteCurrent;
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 6a5cd13..234fad7 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -34,6 +34,7 @@
#include basic/sbx.hxx
#define _SVSTDARR_STRINGS
#include svl/svstdarr.hxx
+#include svl/visitem.hxx
#include ide_pch.hxx
#define _SOLAR__PRIVATE 1
@@ -57,6 +58,7 @@
#include managelang.hxx
#include localizationmgr.hxx
#include helpid.hrc
+#include moduldlg.hxx
#include svtools/texteng.hxx
#include svtools/textview.hxx
@@ -251,6 +253,22 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
}
}
break;
+case SID_GOTOLINE:
+{
+if ( pCurWin pCurWin-IsA( TYPE( ModulWindow ) ) )
+{
+std::auto_ptr GotoLineDialog xGotoDlg( new GotoLineDialog(
pCurWin ) );
+if ( xGotoDlg-Execute() )
+{
+rtl::OUString sText = xGotoDlg-GetText();
+
+sal_Int32 nLine = xGotoDlg-GetLineNumber();
+
+if ( nLine )
+((ModulWindow*)pCurWin)-GetEditView()-SetSelection(
TextSelection( TextPaM( nLine - 1 , 0 ), TextPaM( nLine - 1, 0 ) ) );
+}
+}
+}
default:
{
pCurWin-ExecuteCommand( rReq );
@@ -1017,6 +1035,18 @@ void BasicIDEShell::GetState(SfxItemSet rSet)
rSet.DisableItem( nWh );
}
break;
+case SID_GOTOLINE:
+{
+// if this is not a module window hide the
+// setting, doesn't make sense for example if the
+// dialog editor is open
+if( pCurWin !pCurWin-IsA( TYPE( ModulWindow ) ) )
+{
+rSet.DisableItem( nWh );
+rSet.Put(SfxVisibilityItem(nWh, sal_False));
+}
+break;
+}
}
}
if ( pCurWin )
diff --git a/basctl/source/basicide/basidesh.src
b/basctl/source/basicide/basidesh.src
index 368bad4..c0ca7b4 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@
[Libreoffice-commits] .: sw/source
sw/source/filter/xml/xmlexp.cxx | 134
sw/source/filter/xml/xmlexp.hxx | 21 --
sw/source/filter/xml/xmlimp.cxx | 36 --
sw/source/filter/xml/xmlimp.hxx | 13 ---
4 files changed, 204 deletions(-)
New commits:
commit 91a92b94531cb8997ba204016cd2171f7c118f51
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Nov 16 01:48:40 2011 +0900
removed dead code
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index f03a7b3..4f7ae54 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -90,58 +90,13 @@ using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::xforms;
using namespace ::xmloff::token;
-#ifdef XML_CORE_API
-void SwXMLExport::SetCurPaM( SwPaM rPaM, sal_Bool bWhole, sal_Bool bTabOnly )
-{
-if( !pCurPaM )
-{
-pCurPaM = new SwPaM( *rPaM.End(), *rPaM.Start() );
-}
-else
-{
-*pCurPaM-GetPoint() = *rPaM.Start();
-*pCurPaM-GetMark() = *rPaM.End();
-}
-
-// Set PaM to table/section start node if whole doc should be exported
-if( bWhole )
-{
-SwTableNode *pTblNd = pCurPaM-GetNode()-FindTableNode();
-if( pTblNd )
-{
-pCurPaM-GetPoint()-nNode = *pTblNd;
-
-if( bTabOnly )
-pCurPaM-GetMark()-nNode = *pTblNd-EndOfSectionNode();
-}
-
-SwSectionNode * pSectNd = pCurPaM-GetNode()-FindSectionNode();
-while( pSectNd )
-{
-pCurPaM-GetPoint()-nNode = *pSectNd;
-
-// SwSectionNode::FindSectionNode() returns the section node itself
-pSectNd = pSectNd-StartOfSectionNode()-FindSectionNode();
-}
-}
-}
-#endif
-
SwXMLExport::SwXMLExport(
const uno::Reference lang::XMultiServiceFactory xServiceFactory,
sal_uInt16 nExportFlags)
: SvXMLExport( util::MeasureUnit::INCH, xServiceFactory, XML_TEXT,
nExportFlags ),
-#ifdef XML_CORE_API
-pCurPaM( 0 ),
-pOrigPaM( rPaM ),
-#endif
pTableItemMapper( 0 ),
pTableLines( 0 ),
-#ifdef XML_CORE_API
-bExportWholeDoc( bExpWholeDoc ),
-bExportFirstTableOnly( bExpFirstTableOnly ),
-#endif
bBlock( sal_False ),
bShowProgress( sal_True ),
sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(NumberFormat)),
@@ -151,34 +106,6 @@ SwXMLExport::SwXMLExport(
_InitItemExport();
}
-#ifdef XML_CORE_API
-
-SwXMLExport::SwXMLExport(
-const uno::Reference lang::XMultiServiceFactory xServiceFactory,
-const Reference XModel rModel,
-SwPaM rPaM,
-const OUString rFileName,
-const Reference XDocumentHandler rHandler,
-const Reference XGraphicObjectResolver rEmbeddedGrfObjs,
-sal_Bool bExpWholeDoc, sal_Bool bExpFirstTableOnly,
-sal_Bool bShowProg )
-: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel,
rEmbeddedGrfObjs,
- SW_MOD()-GetMetric(
rPaM.GetDoc()-get(IDocumentSettingAccess::HTML_MODE) ) ),
-pCurPaM( 0 ),
-pOrigPaM( rPaM ),
-pTableItemMapper( 0 ),
-pTableLines( 0 ),
-bExportWholeDoc( bExpWholeDoc ),
-bExportFirstTableOnly( bExpFirstTableOnly ),
-bShowProgress( bShowProg ),
-sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(NumberFormat)),
-sIsProtected(RTL_CONSTASCII_USTRINGPARAM(IsProtected)),
-sCell(RTL_CONSTASCII_USTRINGPARAM(Cell))
-{
-_InitItemExport();
-}
-#endif
-
void SwXMLExport::setBlockMode()
{
bBlock = sal_True;
@@ -923,65 +850,4 @@ OUString SAL_CALL SwXMLExport::getImplementationName()
}
}
-
-#ifdef XML_CORE_API
-void SwXMLExport::ExportCurPaM( sal_Bool bExportWholePaM )
-{
-sal_Bool bFirstNode = sal_True;
-sal_Bool bExportWholeNode = bExportWholePaM;
-
-SwXMLNumRuleInfo aPrevNumInfo;
-SwXMLNumRuleInfo aNextNumInfo;
-
-while( pCurPaM-GetPoint()-nNode.GetIndex()
-pCurPaM-GetMark()-nNode.GetIndex() ||
- ( pCurPaM-GetPoint()-nNode.GetIndex() ==
-pCurPaM-GetMark()-nNode.GetIndex()
- pCurPaM-GetPoint()-nContent.GetIndex() =
-pCurPaM-GetMark()-nContent.GetIndex() ) )
-{
-SwNode *pNd = pCurPaM-GetNode();
-
-aNextNumInfo.Set( *pNd );
-ExportListChange( aPrevNumInfo, aNextNumInfo );
-
-OSL_ENSURE( !(pNd-IsGrfNode() || pNd-IsOLENode()),
-SwXMLExport::exportCurPaM: grf or OLE node unexpected );
-if( pNd-IsTxtNode() )
-{
-SwTxtNode* pTxtNd = pNd-GetTxtNode();
-
-if( !bFirstNode )
-pCurPaM-GetPoint()-nContent.Assign( pTxtNd, 0 );
-
-ExportTxtNode( *pTxtNd, 0, STRING_LEN, bExportWholeNode );
-}
-else if( pNd-IsTableNode() )
-{
-ExportTable( *pNd-GetTableNode() );
-}
-else if( pNd-IsSectionNode() )
-{
-ExportSection( *pNd-GetSectionNode() );
-}
-else if(
[Libreoffice-commits] .: writerfilter/Library_resourcemodel.mk
writerfilter/Library_resourcemodel.mk | 14 ++ 1 file changed, 14 insertions(+) New commits: commit 94a5174e5903c90744b02bc8862031ee818b58e0 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 16 15:35:05 2011 + get this to build on ppc64 linux diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk index 13d5704..f485ef7 100644 --- a/writerfilter/Library_resourcemodel.mk +++ b/writerfilter/Library_resourcemodel.mk @@ -75,9 +75,23 @@ $(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\ CustomTarget/writerfilter/source/sprmcodetostr \ )) + +ifneq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-POWERPC64) +#Apparently some compilers, according to the original .mk this was converted +#from, require this to be noopt or they fail to compile it, probably good to +#revisit that and narrow this down to where it's necessary $(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\ CustomTarget/writerfilter/source/qnametostr \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) +else +#Ironically, on RHEL-6 PPC64 with no-opt the output is too large for the +#toolchain, Error: operand out of range, but it build fine with +#normal flags +$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\ +CustomTarget/writerfilter/source/qnametostr \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/dialog/srchdlg.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit f684c33c9188937c1665b428e705e0ef1673cb11
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 16 16:35:11 2011 +
fix crashing search/replace dialog
Overenthuastic chainsawing from 7776ebfa63cec652131e2be61e2dc198648770db
removed pWindow = LAYOUT_THIS_WINDOW (dialog)
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 14aba87..a885b92 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2484,6 +2484,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window*
_pParent, sal_uInt16 nId
: SfxChildWindow( _pParent, nId )
, dialog (new SvxSearchDialog (_pParent, this, *pBindings))
{
+pWindow = dialog;
dialog-Initialize( pInfo );
pBindings-Update( SID_SEARCH_ITEM );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/dp_persmap.cxx | 27
+--
desktop/source/deployment/inc/dp_persmap.h|5 -
desktop/source/deployment/manager/dp_activepackages.cxx |3
desktop/source/deployment/manager/dp_activepackages.hxx |2
desktop/source/deployment/manager/dp_manager.cxx |3
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 36
+++---
6 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 042247b3e428cb7352c06a670576819c67378090
Author: Michael Meeks michael.me...@suse.com
Date: Wed Nov 16 16:59:39 2011 +
Fixup legacy sleepycat db database usage for packages
Previously empty legacy registered_packages.db databases were created
unconditionally, at some efficiency and startup cost, despite these
being deprectated since before version 3.2.
We now handle version mismatches by warning on the console and ignoring
these files.
diff --git a/desktop/source/deployment/dp_persmap.cxx
b/desktop/source/deployment/dp_persmap.cxx
index 92e4080..c09bb9b 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -79,35 +79,20 @@ PersistentMap::~PersistentMap()
}
//__
-PersistentMap::PersistentMap( OUString const url_, bool readOnly )
+PersistentMap::PersistentMap( OUString const url )
: m_db( 0, 0 )
{
try {
-OUString url( expandUnoRcUrl(url_) );
-if ( File::getSystemPathFromFileURL( url, m_sysPath ) != File::E_None )
-{
+rtl::OUString fileURL = expandUnoRcUrl(url);
+if ( File::getSystemPathFromFileURL( fileURL, m_sysPath ) !=
File::E_None )
OSL_ASSERT( false );
-}
+
OString cstr_sysPath(
OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
-char const * pcstr_sysPath = cstr_sysPath.getStr();
-
-u_int32_t flags = DB_CREATE;
-if (readOnly) {
-flags = DB_RDONLY;
-if (! create_ucb_content(
-0, url,
-Referencecom::sun::star::ucb::XCommandEnvironment(),
-false /* no throw */ )) {
-// ignore non-existent file in read-only mode: simulate empty
db
-pcstr_sysPath = 0;
-flags = DB_CREATE;
-}
-}
-
int err = m_db.open(
// xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used
-0, pcstr_sysPath, 0, DB_HASH, flags/* | DB_THREAD*/, 0664 /* fs
mode */ );
+0, cstr_sysPath.getStr(), 0, DB_HASH,
+DB_CREATE/* | DB_THREAD*/, 0664 /* fs mode */ );
if (err != 0)
throw_rtexc(err);
}
diff --git a/desktop/source/deployment/inc/dp_persmap.h
b/desktop/source/deployment/inc/dp_persmap.h
index c078cf9..a81cef5 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -41,7 +41,8 @@ namespace dp_misc
typedef ::boost::unordered_map
::rtl::OString, ::rtl::OString, ::rtl::OStringHash t_string2string_map;
-//==
+// Class to read obsolete registered extensions
+// should be removed for LibreOffice 4.0
class PersistentMap
{
::rtl::OUString m_sysPath;
@@ -50,7 +51,7 @@ class PersistentMap
public:
~PersistentMap();
-PersistentMap( ::rtl::OUString const url, bool readOnly );
+PersistentMap( ::rtl::OUString const url );
/** in mem db */
PersistentMap();
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx
b/desktop/source/deployment/manager/dp_activepackages.cxx
index f220aaf..47cc72f 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -127,8 +127,7 @@ namespace dp_manager {
ActivePackages::ActivePackages() {}
-ActivePackages::ActivePackages(::rtl::OUString const url, bool readOnly):
-m_map(url, readOnly) {}
+ActivePackages::ActivePackages(::rtl::OUString const url) : m_map(url) {}
ActivePackages::~ActivePackages() {}
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx
b/desktop/source/deployment/manager/dp_activepackages.hxx
index 2a4d186..61057bc 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -71,7 +71,7 @@ public:
ActivePackages();
-ActivePackages(::rtl::OUString const url, bool readOnly);
+ActivePackages(::rtl::OUString const url);
~ActivePackages();
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 680dbf8..0e88d1f 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++
[Libreoffice-commits] .: patches/dev300
patches/dev300/sfx-check-real-help-path.diff | 73 ---
1 file changed, 73 deletions(-)
New commits:
commit e165ab7c2daed295a1d947cd81de1bb65c8dba59
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Nov 16 18:37:12 2011 +0100
remove patches/dev300/sfx-check-real-help-path.diff, obsolete as per
original author (pmladek)
diff --git a/patches/dev300/sfx-check-real-help-path.diff
b/patches/dev300/sfx-check-real-help-path.diff
deleted file mode 100644
index 131b6d2..000
--- a/patches/dev300/sfx-check-real-help-path.diff
+++ /dev/null
@@ -1,73 +0,0 @@
- sfx2/source/appl/sfxhelp.cxx | 19 +--
- unotools/source/config/pathoptions.cxx |6 +-
- 2 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/sfxhelp.cxx
-index d5e6f24..df94b19 100644
sfx2/source/appl/sfxhelp.cxx
-+++ sfx2/source/appl/sfxhelp.cxx
-@@ -53,10 +53,10 @@
- #include com/sun/star/system/SystemShellExecuteFlags.hpp
- #include unotools/configmgr.hxx
- #include unotools/configitem.hxx
-+#include unotools/localfilehelper.hxx
- #include svtools/helpopt.hxx
- #include unotools/moduleoptions.hxx
- #include tools/urlobj.hxx
--#include unotools/configmgr.hxx
- #include ucbhelper/content.hxx
- #include unotools/pathoptions.hxx
- #include rtl/ustring.hxx
-@@ -126,13 +126,13 @@ rtl::OUString HelpLocaleString()
- aLocaleStr = aEnglish;
- else
- {
--rtl::OUString aBaseInstallPath;
--// utl::Bootstrap::PathStatus aBaseLocateResult =
--utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
--static const char *szHelpPath = /help/;
-+String sBaseHelpPathString;
-+::utl::LocalFileHelper::ConvertPhysicalNameToURL(
SvtPathOptions().GetHelpPath(), sBaseHelpPathString );
-+
-+rtl::OUString sBaseHelpPath( sBaseHelpPathString );
-+sBaseHelpPath += rtl::OUString::createFromAscii(/);
-
--rtl::OUString sHelpPath = aBaseInstallPath +
--rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr;
-+rtl::OUString sHelpPath = sBaseHelpPath + aLocaleStr;
- osl::DirectoryItem aDirItem;
-
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) ==
osl::FileBase::E_None)
-@@ -143,9 +143,8 @@ rtl::OUString HelpLocaleString()
- if (nSepPos != STRING_NOTFOUND)
- {
- bOk = true;
--sLang = sLang.Copy( 0, nSepPos );
--sHelpPath = aBaseInstallPath +
--rtl::OUString::createFromAscii(szHelpPath) + sLang;
-+sLang = sLang.Copy( 0, nSepPos );
-+sHelpPath = sBaseHelpPath + sLang;
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) ==
osl::FileBase::E_None)
- bOk = false;
- }
-diff --git unotools/source/config/pathoptions.cxx
unotools/source/config/pathoptions.cxx
-index b02f912..f16e68f 100644
unotools/source/config/pathoptions.cxx
-+++ unotools/source/config/pathoptions.cxx
-@@ -299,7 +299,11 @@ const String SvtPathOptions_Impl::GetPath(
SvtPathOptions::Pathes ePath )
- {
- // These office paths have to be converted to system pathes
- utl::LocalFileHelper::ConvertURLToPhysicalName( aPathValue,
aResult );
--aPathValue = aResult;
-+// FIXME: The initial value (not modified by SetPath) is just a
path, so the URL-conversion fails.
-+//The best solution is to fix the module xmlhelp to
accept the URL. Then we could remove
-+//all these ugly conversions.
-+if ( aResult.Len() != 0 )
-+aPathValue = aResult;
- }
-
- m_aPathArray[ ePath ] = aPathValue;
---
-1.7.0.1
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oowintool post_download.in
oowintool| 16 +++-
post_download.in | 12 ++--
2 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 41e995ec361cd466a3f287d3eb33c0080bdbb50c
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 16 20:59:16 2011 +0100
x64 merge modules are not mandatory, only warn when they are missing.
diff --git a/oowintool b/oowintool
index bf5c5d9..6cb98a3 100755
--- a/oowintool
+++ b/oowintool
@@ -46,7 +46,8 @@ sub print_syntax()
print commands:\n;
print--msvc-ver - print version of MSVC eg. 6.0\n;
print--msvc-copy-dlls dest - copy msvc[pr]??.dlls into
dest/msvcp??/\n;
-print--msvc-copy-msms dest - copy mscrt merge modules
dest/msm90/\n;
+print--msvc-copy-msms dest - copy mscrt merge modules to
dest/msm90/\n;
+print--msvc-copy-msms-64 ds- copy the x64 mscrt merge modules to
ds/msm90/\n;
print--msvc-productdir - print productdir\n;
print--msvs-productdir - print productdir\n;
print--dotnetsdk-dir - print .NET SDK path\n;
@@ -285,16 +286,17 @@ sub msvc_copy_dlls($)
}
}
-sub msvc_copy_msms($)
+sub msvc_copy_msms($$)
{
-my $dest = shift;
+# $postfix is empty for x86, and '_x64' for x64
+my ($dest, $postfix) = @_;
my $common_files_path = $ENV{CommonProgramFiles(x86)};
if (!defined $common_files_path) {
$common_files_path = $ENV{CommonProgramFiles};
}
defined $common_files_path || return;
my $msm_path = (cygpath $common_files_path . \\Merge Modules, 'w',
$output_format);
-foreach $fname ('Microsoft_VC90_CRT_x86.msm',
'Microsoft_VC90_CRT_x86_x64.msm', 'policy_9_0_Microsoft_VC90_CRT_x86.msm',
'policy_9_0_Microsoft_VC90_CRT_x86_x64.msm') {
+foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm,
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
print STDERR Copying $msm_path/$fname to $dest\n;
copy ($msm_path/$fname, $dest) || die copy failed: $!;
}
@@ -330,7 +332,11 @@ while (@commands) {
} elsif ($opt eq '--msvc-copy-msms') {
my $dest = shift @commands;
defined $dest || die copy-msms requires a destination directory;
- msvc_copy_msms( $dest );
+ msvc_copy_msms( $dest, '' );
+} elsif ($opt eq '--msvc-copy-msms-64') {
+ my $dest = shift @commands;
+ defined $dest || die copy-msms-64 requires a destination directory;
+ msvc_copy_msms( $dest, '_x64' );
} elsif ($opt eq '--msvs-productdir') {
print_msvs_productdir();
} elsif ($opt eq '--msvc-productdir') {
diff --git a/post_download.in b/post_download.in
index c93cd27..ea6b943 100644
--- a/post_download.in
+++ b/post_download.in
@@ -38,9 +38,7 @@ dnl
===
dnl Windows builds - use oowintool to copy CRT dlls and manifest
dnl ===
if test $COM = MSC; then
- if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
- :
-else
+if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then
AC_MSG_ERROR([oowintool failed to copy CRT])
fi
fi
@@ -49,11 +47,13 @@ dnl
===
dnl Windows builds - use oowintool to copy VC redist merge modules
dnl ===
if test $COM = MSC; then
- if ./oowintool --msvc-copy-msms ./external/msm90 ; then
- :
-else
+if ! ./oowintool --msvc-copy-msms ./external/msm90 ; then
AC_MSG_ERROR([oowintool failed to copy merge modules])
fi
+if ! ./oowintool --msvc-copy-msms-64 ./external/msm90 ; then
+ AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation
+will lack the 64-bit Explorer extension])
+fi
fi
dnl ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dbdata.hxx | 25 -
sc/source/core/inc/interpre.hxx |1
sc/source/core/tool/dbdata.cxx | 109 ++--
3 files changed, 75 insertions(+), 60 deletions(-)
New commits:
commit efab685286432e36821d60264f978d98407b800c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Nov 16 15:35:21 2011 -0500
Reduced header dependency on dbdata.hxx by better encapsulation.
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index c48aa1a..1aab271 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -30,28 +30,27 @@
#define SC_DBCOLECT_HXX
#include scdllapi.h
-#include collect.hxx
-#include global.hxx // MAXQUERY
-#include sortparam.hxx// MAXSORT
#include refreshtimer.hxx
#include address.hxx
-#include scdllapi.h
-#include subtotalparam.hxx
-#include queryparam.hxx
+#include global.hxx
#include boost/ptr_container/ptr_vector.hpp
#include boost/ptr_container/ptr_set.hpp
#include boost/scoped_ptr.hpp
class ScDocument;
+struct ScSortParam;
+struct ScQueryParam;
+struct ScSubTotalParam;
+struct ScImportParam;
class ScDBData : public ScRefreshTimer
{
private:
-ScSortParam maSortParam;
-ScQueryParam maQueryParam;
-ScSubTotalParam maSubTotal;
-ScImportParam maImportParam;
+boost::scoped_ptrScSortParam mpSortParam;
+boost::scoped_ptrScQueryParam mpQueryParam;
+boost::scoped_ptrScSubTotalParam mpSubTotal;
+boost::scoped_ptrScImportParam mpImportParam;
// DBParam
const ::rtl::OUString aName;
@@ -137,10 +136,10 @@ public:
boolIsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly) const;
boolIsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2) const;
-boolHasImportParam() const { return maImportParam.bImport; }
+boolHasImportParam() const;
SC_DLLPUBLIC bool HasQueryParam() const;
-boolHasSortParam() const { return maSortParam.bDoSort[0]; }
-boolHasSubTotalParam() const { return maSubTotal.bGroupActive[0]; }
+boolHasSortParam() const;
+boolHasSubTotalParam() const;
boolHasImportSelection() const { return bDBSelection; }
voidSetImportSelection(bool bSet) { bDBSelection = bSet; }
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index ddfd6d9..3892eaa 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -50,6 +50,7 @@ class ScDBRangeBase;
struct MatrixDoubleOp;
struct ScQueryParam;
struct ScDBQueryParamBase;
+struct ScQueryEntry;
struct ScCompare;
struct ScCompareOptions;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index abb4c6d..e897630 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -32,7 +32,6 @@
#include unotools/transliterationwrapper.hxx
#include dbdata.hxx
-#include global.hxx
#include globalnames.hxx
#include refupdat.hxx
#include rechead.hxx
@@ -41,6 +40,7 @@
#include queryentry.hxx
#include globstr.hrc
#include subtotalparam.hxx
+#include sortparam.hxx
#include memory
@@ -62,6 +62,10 @@ ScDBData::ScDBData( const ::rtl::OUString rName,
SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bByR, bool bHasH) :
+mpSortParam(new ScSortParam),
+mpQueryParam(new ScQueryParam),
+mpSubTotal(new ScSubTotalParam),
+mpImportParam(new ScImportParam),
aName (rName),
aUpper (rName),
nTable (nTab),
@@ -81,21 +85,14 @@ ScDBData::ScDBData( const ::rtl::OUString rName,
bModified (false)
{
ScGlobal::pCharClass-toUpper(aUpper);
-ScSortParam aSortParam;
-ScQueryParam aQueryParam;
-ScImportParam aImportParam;
-
-SetSortParam( aSortParam );
-SetQueryParam( aQueryParam );
-SetImportParam( aImportParam );
}
ScDBData::ScDBData( const ScDBData rData ) :
ScRefreshTimer ( rData ),
-maSortParam (rData.maSortParam),
-maQueryParam(rData.maQueryParam),
-maSubTotal (rData.maSubTotal),
-maImportParam (rData.maImportParam),
+mpSortParam(new ScSortParam(*rData.mpSortParam)),
+mpQueryParam(new ScQueryParam(*rData.mpQueryParam)),
+mpSubTotal(new ScSubTotalParam(*rData.mpSubTotal)),
+mpImportParam(new ScImportParam(*rData.mpImportParam)),
aName (rData.aName),
aUpper (rData.aUpper),
nTable (rData.nTable),
@@ -119,10 +116,10 @@ ScDBData::ScDBData( const ScDBData rData ) :
ScDBData::ScDBData( const ::rtl::OUString rName, const ScDBData rData ) :
ScRefreshTimer ( rData ),
-maSortParam (rData.maSortParam),
-maQueryParam(rData.maQueryParam),
-maSubTotal (rData.maSubTotal),
-maImportParam (rData.maImportParam),
+mpSortParam(new
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 11
--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 2fc7e56a6ce702645f9147a4ea2ec6fb85398380
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 16 20:38:11 2011 +
push/pop deprecated
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 83ecba9..f9d635a 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -226,15 +226,22 @@ BackendImpl::BackendImpl(
deleteUnusedFolders(OUString(), folders);
configmgrini_verify_init( xCmdEnv );
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptrPersistentMap pMap;
+SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString aCompatURL( makeURL( getCachePath(),
OUSTR(registered_packages.db) ) );
// Don't create it if it doesn't exist already
if ( ::utl::UCBContentHelper::Exists( expandUnoRcUrl( aCompatURL ) ) )
{
-try {
+try
+{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
pMap = ::std::auto_ptrPersistentMap( new PersistentMap(
aCompatURL ) );
-} catch (Exception e) { // const uno::RunTimeException e) {
+SAL_WNODEPRECATED_DECLARATIONS_POP
+}
+catch (const Exception e)
+{
rtl::OStringBuffer aStr( Exception loading legacy package
database: ' );
aStr.append( rtl::OUStringToOString( e.Message,
osl_getThreadTextEncoding() ) );
aStr.append( ' - ignoring file, please remove it.\n );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc
sc/inc/lookupcache.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d37950cb1678b1560e1c2ca17c38caa7a008df87 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Wed Nov 16 15:43:29 2011 -0500 This header doesn't need to include queryparam.hxx. diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index d70b1b5..b99ee68 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -31,7 +31,6 @@ #include address.hxx #include global.hxx -#include queryparam.hxx #include formula/token.hxx #include svl/listener.hxx #include tools/string.hxx @@ -39,6 +38,7 @@ #include boost/unordered_map.hpp class ScDocument; +struct ScQueryEntry; /** Lookup cache for one range used with interpreter functions such as VLOOKUP and MATCH. Caches query for a specific row and the resulting address looked ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/line-numbers-in-basicIDE' - basctl/source
basctl/source/basicide/baside2.cxx |5 +
basctl/source/basicide/baside2.hxx |5 +
basctl/source/basicide/baside2b.cxx | 30 ++
basctl/source/basicide/basides1.cxx |2 +-
4 files changed, 37 insertions(+), 5 deletions(-)
New commits:
commit 4a0a577c6198d207b18efa7aaeb7eb847ff7be2b
Author: August Sodora aug...@gmail.com
Date: Wed Nov 16 16:45:38 2011 -0500
Finished making it possible to toggle line numbers in the basic ide
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 98e1b74..e449ba9 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1401,6 +1401,11 @@ sal_Bool ModulWindow::IsReadOnly()
return bReadOnly;
}
+void ModulWindow::SetLineNumberDisplay(bool b)
+{
+aXEditorWindow.SetLineNumberDisplay(b);
+}
+
sal_Bool ModulWindow::IsPasteAllowed()
{
sal_Bool bPaste = sal_False;
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 1de34d7..48a65c9 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -290,6 +290,7 @@ private:
LineNumberWindowaLineNumberWindow;
EditorWindowaEdtWindow;
ScrollBar aEWVScrollBar;
+boolbLineNumberDisplay;
virtual void DataChanged(DataChangedEvent const rDCEvt);
@@ -304,6 +305,8 @@ public:
LineNumberWindow GetLineNumberWindow() { return aLineNumberWindow; }
EditorWindow GetEdtWindow() { return aEdtWindow; }
ScrollBar GetEWVScrollBar() { return aEWVScrollBar; }
+
+void SetLineNumberDisplay(bool b);
};
@@ -365,6 +368,8 @@ public:
virtual voidSetReadOnly( sal_Bool bReadOnly );
virtual sal_BoolIsReadOnly();
+void SetLineNumberDisplay(bool);
+
StarBASIC* GetBasic() { XModule(); return xBasic; }
SbModule* GetSbModule() { return xModule; }
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index be08268..2a4d8ce 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1630,13 +1630,13 @@ ComplexEditorWindow::ComplexEditorWindow( ModulWindow*
pParent ) :
aBrkWindow( this ),
aLineNumberWindow( this, pParent ),
aEdtWindow( this ),
-aEWVScrollBar( this, WB_VSCROLL | WB_DRAG )
+aEWVScrollBar( this, WB_VSCROLL | WB_DRAG ),
+bLineNumberDisplay(false)
{
aEdtWindow.SetModulWindow( pParent );
aBrkWindow.SetModulWindow( pParent );
aEdtWindow.Show();
aBrkWindow.Show();
-aLineNumberWindow.Show();
aEWVScrollBar.SetLineSize( SCROLL_LINE );
aEWVScrollBar.SetPageSize( SCROLL_PAGE );
@@ -1659,8 +1659,16 @@ void ComplexEditorWindow::Resize()
Size aLnSz(aLineNumberWindow.GetWidth(), aSz.Height());
aLineNumberWindow.SetPosSizePixel(Point(DWBORDER+aBrkSz.Width() - 1,
DWBORDER), aLnSz);
-Size aEWSz(aSz.Width() - nBrkWidth - aLineNumberWindow.GetWidth() -
nSBWidth + 2, aSz.Height());
-aEdtWindow.SetPosSizePixel( Point(
DWBORDER+aBrkSz.Width()+aLnSz.Width()-1, DWBORDER ), aEWSz );
+if(bLineNumberDisplay)
+{
+Size aEWSz(aSz.Width() - nBrkWidth - aLineNumberWindow.GetWidth() -
nSBWidth + 2, aSz.Height());
+aEdtWindow.SetPosSizePixel( Point(
DWBORDER+aBrkSz.Width()+aLnSz.Width()-1, DWBORDER ), aEWSz );
+}
+else
+{
+Size aEWSz(aSz.Width() - nBrkWidth - nSBWidth + 1, aSz.Height());
+aEdtWindow.SetPosSizePixel(Point(DWBORDER + aBrkSz.Width() - 1,
DWBORDER), aEWSz);
+}
aEWVScrollBar.SetPosSizePixel( Point( aOutSz.Width()-DWBORDER-nSBWidth,
DWBORDER ), Size( nSBWidth, aSz.Height() ) );
}
@@ -1696,6 +1704,20 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent
const rDCEvt)
}
}
+void ComplexEditorWindow::SetLineNumberDisplay(bool b)
+{
+if(b == bLineNumberDisplay)
+return;
+
+if(b)
+aLineNumberWindow.Show();
+else
+aLineNumberWindow.Hide();
+
+bLineNumberDisplay = b;
+Resize();
+}
+
uno::Reference awt::XWindowPeer
EditorWindow::GetComponentInterface(sal_Bool bCreate)
{
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index c10ff6d..7a500fe 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -113,7 +113,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
lcl_GetSourceLinesEnabledValue() = bValue;
if ( pCurWin pCurWin-IsA( TYPE( ModulWindow ) ) )
{
-//(ModuleWindow*)(pCurWin)-SetLineNumberDisplay( bValue );
+dynamic_castModulWindow*(pCurWin)-SetLineNumberDisplay(
bValue );
}
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 9bd7655d4bf1df440ed6af11c213bfa346b5b287
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 16 12:37:04 2011 +0100
Fix slideshow crasher
Recursive event loop killed SlideshowImpl object under my hands -
make it stay until we pop out of callstack again.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8a400d2..9320719 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1881,6 +1881,9 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG )
IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG )
{
+// prevent me from deletion when recursing (App::Reschedule does)
+const rtl::ReferenceSlideshowImpl this_(this);
+
Application::EnableNoYieldMode(false);
Application::RemovePostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
Application::Reschedule(true); // fix for fdo#32861 - process
@@ -1896,7 +1899,7 @@ IMPL_LINK( SlideshowImpl, PostYieldListener, void*,
EMPTYARG )
sal_Int32 SlideshowImpl::updateSlideShow (void)
{
-// doing some nMagic
+// prevent me from deletion when recursing (App::EnableYieldMode does)
const rtl::ReferenceSlideshowImpl this_(this);
Reference XSlideShow xShow( mxShow );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: testtools/source
testtools/source/bridgetest/makefile.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4f11d0aa461537efa2705e7b49bc2c828a700e43 Author: Jan Holesovsky ke...@suse.cz Date: Wed Nov 16 22:57:28 2011 +0100 Revert the component.map removal from makefile to fix Windows build. diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index cc3661a..31c5b7e 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -88,7 +88,7 @@ SHL1STDLIBS= \ SHL1LIBS= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -SHL1USE_EXPORTS = name +SHL1VERSIONMAP = $(SOLARENV)/src/component.map # test object @@ -107,7 +107,7 @@ SHL2STDLIBS= \ SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) -SHL2USE_EXPORTS = name +SHL2VERSIONMAP = $(SOLARENV)/src/component.map SHL3TARGET = constructors.uno SHL3OBJS = $(SLO)$/constructors.obj ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/line-numbers-in-basicIDE' - basctl/source
basctl/source/basicide/baside2b.cxx |7 +++-
basctl/source/basicide/linenumberwindow.cxx | 44 +---
basctl/source/basicide/linenumberwindow.hxx |8 -
3 files changed, 53 insertions(+), 6 deletions(-)
New commits:
commit 3ee2d7b864fcf3364dbf1b8270b4aa176ff7d062
Author: August Sodora aug...@gmail.com
Date: Thu Nov 17 00:19:47 2011 -0500
Fixed scrolling bug
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 2a4d8ce..a80e9e4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -333,6 +333,7 @@ void EditorWindow::Resize()
pEditView-SetStartDocPos( aStartDocPos );
pEditView-ShowCursor();
pModulWindow-GetBreakPointWindow().GetCurYOffset() =
aStartDocPos.Y();
+pModulWindow-GetLineNumberWindow().GetCurYOffset() =
aStartDocPos.Y();
}
InitScrollBars();
if ( nVisY != pEditView-GetStartDocPos().Y() )
@@ -574,6 +575,7 @@ void EditorWindow::CreateEditEngine()
pEditView-SetStartDocPos( Point( 0, 0 ) );
pEditView-SetSelection( TextSelection() );
pModulWindow-GetBreakPointWindow().GetCurYOffset() = 0;
+pModulWindow-GetLineNumberWindow().GetCurYOffset() = 0;
pEditEngine-SetUpdateMode( sal_True );
Update(); // has only been invalidated at UpdateMode = sal_True
@@ -661,7 +663,9 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/, const
SfxHint rHint )
pModulWindow-GetEditVScrollBar().SetThumbPos(
pEditView-GetStartDocPos().Y() );
pModulWindow-GetBreakPointWindow().DoScroll
( 0, pModulWindow-GetBreakPointWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
-pModulWindow-GetLineNumberWindow().Invalidate();
+pModulWindow-GetLineNumberWindow().DoScroll
+( 0, pModulWindow-GetLineNumberWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
+pModulWindow-Invalidate();
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
{
@@ -1681,6 +1685,7 @@ IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *,
pCurScrollBar )
long nDiff = aEdtWindow.GetEditView()-GetStartDocPos().Y() -
pCurScrollBar-GetThumbPos();
aEdtWindow.GetEditView()-Scroll( 0, nDiff );
aBrkWindow.DoScroll( 0, nDiff );
+aLineNumberWindow.DoScroll(0, nDiff);
aEdtWindow.GetEditView()-ShowCursor( sal_False, sal_True );
pCurScrollBar-SetThumbPos(
aEdtWindow.GetEditView()-GetStartDocPos().Y() );
}
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index 5168da1..deba85d 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -7,7 +7,8 @@
LineNumberWindow::LineNumberWindow( Window* pParent, ModulWindow* pModulWin ) :
Window( pParent, WB_BORDER ),
pModulWindow(pModulWin),
- nWidth(1)
+ nWidth(1),
+ nCurYOffset(0)
{
SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
}
@@ -16,6 +17,9 @@ LineNumberWindow::~LineNumberWindow() { }
void LineNumberWindow::Paint( const Rectangle )
{
+ if(SyncYOffset())
+return;
+
ExtTextEngine* txtEngine = pModulWindow-GetEditEngine();
if(!txtEngine)
return;
@@ -27,9 +31,9 @@ void LineNumberWindow::Paint( const Rectangle )
GetParent()-Resize();
ulong windowHeight = GetOutputSize().Height();
- ulong startY = txtView-GetStartDocPos().Y();
ulong nLineHeight = GetTextHeight();
+ ulong startY = txtView-GetStartDocPos().Y();
ulong nStartLine = startY / nLineHeight + 1;
ulong nEndLine = (startY + windowHeight) / nLineHeight + 1;
@@ -38,8 +42,9 @@ void LineNumberWindow::Paint( const Rectangle )
nWidth = String::CreateFromInt64(nEndLine).Len() * 10;
- for(ulong i = nStartLine, y = 0; i nEndLine; ++i, y += nLineHeight)
-DrawText(Point(0, y), String::CreateFromInt64(i));
+ sal_Int64 y = (nStartLine - 1) * nLineHeight;
+ for(ulong i = nStartLine; i = nEndLine; ++i, y += nLineHeight)
+DrawText(Point(0, y - nCurYOffset), String::CreateFromInt64(i));
}
void LineNumberWindow::DataChanged(DataChangedEvent const rDCEvt)
@@ -56,3 +61,34 @@ void LineNumberWindow::DataChanged(DataChangedEvent const
rDCEvt)
}
}
}
+
+void LineNumberWindow::DoScroll(long nHorzScroll, long nVertScroll)
+{
+ nCurYOffset -= nVertScroll;
+ Window::Scroll(nHorzScroll, nVertScroll);
+}
+
+long LineNumberWindow::GetCurYOffset()
+{
+ return nCurYOffset;
+}
+
+bool LineNumberWindow::SyncYOffset()
+{
+ TextView* pView = pModulWindow-GetEditView();
+ if (!pView)
+return false;
+
+ long nViewYOffset = pView-GetStartDocPos().Y();
+ if (nCurYOffset == nViewYOffset)
+return false;
+
+ nCurYOffset = nViewYOffset;
+ Invalidate();
+ return true;
+}
+
+ulong LineNumberWindow::GetWidth()
+{
+ return (nWidth 20 ? 20 :
[Libreoffice-commits] .: Branch 'feature/line-numbers-in-basicIDE' - basctl/source
basctl/source/basicide/baside2b.cxx | 42 +++- 1 file changed, 18 insertions(+), 24 deletions(-) New commits: commit d78f9e76e9bf1d14ef1d087ade0de8c4ec58329e Author: August Sodora aug...@gmail.com Date: Thu Nov 17 00:42:15 2011 -0500 Removed unused includes diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index a80e9e4..1fb174a 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -29,44 +29,38 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include precompiled_basctl.hxx -#include vector #define _BASIC_TEXTPORTIONS -#include basic/sbdef.hxx -#include ide_pch.hxx +#include helpid.hrc +#include baside2.hrc -#include tools/urlobj.hxx -#include unotools/charclass.hxx -#include svl/urihelper.hxx -#include basic/sbx.hxx +#include baside2.hxx +#include basobj.hxx +#include brkdlg.hxx +#include iderdll.hxx +#include iderdll2.hxx +#include objdlg.hxx + +#include basic/sbmeth.hxx +#include basic/sbuno.hxx +#include com/sun/star/script/XLibraryContainer2.hpp +#include comphelper/processfactory.hxx +#include comphelper/string.hxx +#include sfx2/dispatch.hxx +#include sfx2/viewfrm.hxx +#include vcl/msgbox.hxx #include vcl/sound.hxx +#include svl/urihelper.hxx #include svtools/xtextedt.hxx #include svtools/txtattr.hxx #include svtools/textwindowpeer.hxx -#include basic/sbuno.hxx - -#include helpid.hrc -#include baside2.hrc -#include baside2.hxx -#include brkdlg.hxx -#include objdlg.hxx -#include basobj.hxx -#include iderdll.hxx -#include iderdll2.hxx #include vcl/taskpanelist.hxx #include vcl/help.hxx - #include unotools/sourceviewconfig.hxx -#include com/sun/star/script/XLibraryContainer2.hpp -#include comphelper/processfactory.hxx -#include comphelper/string.hxx - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - long nVirtToolBoxHeight;// inited in WatchWindow, used in Stackwindow long nHeaderBarHeight; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: smoketestoo_native/com smoketestoo_native/makefile.mk
smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk |2 ++ smoketestoo_native/makefile.mk |2 ++ 2 files changed, 4 insertions(+) New commits: commit 0e6f04001c49b0d10575541acb122257cad45cff Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 17 08:16:38 2011 +0100 Fixed dmake depend=x. diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk index be7af05..937f377 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk +++ b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk @@ -62,6 +62,7 @@ ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\ .INCLUDE : target.mk +.IF $(depend) == $(MISC)/$(TARGET)/META-INF: @-$(MKDIRHIER) $(@) @@ -81,6 +82,7 @@ $(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb $(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN) $(COMMAND_ECHO)$(COPY) $ $@ +.END .ELSE @all: diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 8c7d811..24732ab 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -49,7 +49,9 @@ DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk .INCLUDE: installationtest.mk +.IF $(depend) == ALLTAR : cpptest +.END cpptest : $(SHL1TARGETN) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
