summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2010-11-26 17:50:29 +0100
committerRene Engelhard <rene@debian.org>2010-11-26 17:50:29 +0100
commit282305273e2c19b546ba81b934eab815c6e48e37 (patch)
tree495c6699b1c243d3aae9f533b593019a8656a62d
parent0ddcd213811c412f9b5cd5f96a94ba0dfa1a615f (diff)
parent84a939e443d0d90eefffa75921d3c921e0bf9c42 (diff)
Merge branch 'libreoffice-3-3'
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx12
-rw-r--r--editeng/source/misc/svxacorr.cxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkFilePicker.cxx2
-rw-r--r--framework/uiconfig/startmodule/menubar/menubar.xml2
-rwxr-xr-xofficecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu2
-rw-r--r--readlicense_oo/odt/makefile.mk4
-rw-r--r--readlicense_oo/prj/d.lst1
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc2
8 files changed, 17 insertions, 10 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 5a6caae1dd..10ddadc529 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -249,9 +249,12 @@ namespace
if(nPushFlags)
{
OSL_ENSURE(maPropertyHolders.size(), "PropertyHolders: PUSH with no property holders (!)");
- PropertyHolder* pNew = new PropertyHolder(*maPropertyHolders.back());
- pNew->setPushFlags(nPushFlags);
- maPropertyHolders.push_back(pNew);
+ if ( !maPropertyHolders.empty() )
+ {
+ PropertyHolder* pNew = new PropertyHolder(*maPropertyHolders.back());
+ pNew->setPushFlags(nPushFlags);
+ maPropertyHolders.push_back(pNew);
+ }
}
}
@@ -355,8 +358,9 @@ namespace
PropertyHolder& Current()
{
+ static PropertyHolder aDummy;
OSL_ENSURE(maPropertyHolders.size(), "PropertyHolders: CURRENT with no property holders (!)");
- return *maPropertyHolders.back();
+ return maPropertyHolders.empty() ? aDummy : *maPropertyHolders.back();
}
~PropertyHolders()
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 65787328c4..5321f6104a 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -690,7 +690,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
bRunNext = true;
}
}
- else if (cChar == '/' && nEndPos >= 2)
+ else if ( cChar == '/' && nEndPos > 1 && rTxt.Len() > (nEndPos - 1) )
{
// Remove the hardspace right before to avoid formatting URLs
sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 585888d5e8..7de49719ec 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -917,7 +917,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
++aListIter
)
{
- if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 )
+ if( aListIter->getFilter().equalsIgnoreAsciiCase( aStarDot+sExtension ) )
{
if( !aNewFilter.getLength() )
aNewFilter = aListIter->getTitle();
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index fac0b3c081..5ac4c3eb4b 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -76,7 +76,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Credits"/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 15dd7d20f6..ed5a78ee22 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4145,7 +4145,7 @@
<value xml:lang="en-US">License Information...</value>
</prop>
</node>
- <node oor:name=".uno:Credits" oor:op="replace">
+ <node oor:name=".uno:ShowCredits" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">%PRODUCTNAME Credits...</value>
</prop>
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
index 1e68a1722e..89cea1a3dc 100644
--- a/readlicense_oo/odt/makefile.mk
+++ b/readlicense_oo/odt/makefile.mk
@@ -36,7 +36,7 @@ TARGET=odt
# --- Files --------------------------------------------------------
-all: $(MISC)$/LICENSE.odt
+all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
# --- Targets ------------------------------------------------------
@@ -44,3 +44,5 @@ all: $(MISC)$/LICENSE.odt
$(MISC)$/LICENSE.odt: LICENSE.odt
$(COPY) LICENSE.odt $@
+$(MISC)$/CREDITS.odt: CREDITS.odt
+ $(COPY) CREDITS.odt $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 2a368beb78..aa771c5011 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -27,6 +27,7 @@ mkdir: %_DEST%\bin%_EXT%\ure
..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
+..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
dos: echo =====================================================================
dos: echo Delivering README files
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 161237ba54..c823aaa80a 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -126,7 +126,7 @@
#define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
#define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
-#define SID_SHOW_CREDITS (SID_SFX_START + 1684)
+#define SID_SHOW_CREDITS (SID_SFX_START + 1711)
#define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
// default-ids for document