[Libreoffice-commits] core.git: dictionaries helpcontent2
dictionaries |2 +- helpcontent2 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8d69ca2d310de2e6275b93b4fd6cd40f05e9e84e Author: Christian Lohmaier Date: Wed Jul 4 22:45:06 2018 +0200 reset submodules to their corresponding branch was broken after gerrit update Change-Id: I56cc1ab0e9d5bb4acb54d5ca5538fefae290253c diff --git a/dictionaries b/dictionaries index 2180c26eabed..43f9b34b3bf6 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 2180c26eabeda8ed3315bc04acd0dd4fc3246736 +Subproject commit 43f9b34b3bf68f252a68827adf59a7f9a4b4d935 diff --git a/helpcontent2 b/helpcontent2 index 02fdfc49125c..2e878c0fb7d7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 02fdfc49125c2059e0153fc9f97da4ed71ae0b2c +Subproject commit 2e878c0fb7d7ea39589c0b919d649ef109baf1d3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries helpcontent2 offapi/com toolkit/source
dictionaries |2 +-
helpcontent2 |2 +-
offapi/com/sun/star/awt/XToolkit.idl |6 +-
toolkit/source/awt/vclxtoolkit.cxx | 11 ---
4 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 99d8ce56ecfc4af77cf9b2dc1120d821cba20bee
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 15 14:49:01 2013 +0200
fdo#66762 - Other: com.sun.star.awt.DisplayAccess removed
API_CHANGE:
I removed the undocumented internal API
com.sun.star.awt.DisplayAccess
in commit dde234b6955a421d51d2b37e4fc3972c660146f0
fdo#46808, remove awt::DisplayAccess service.
However, it appears someone was actually using this.
Now, at the same time, we have a method in XToolkit, getWorkArea(),
which looks like it was designed to return this exact information,
but which has been returning zero for as far back as our commit
history goes.
So, to kill two birds with one stone, this commit changes
getWorkArea() to return the information the customer needs, to wit,
the size and position of the primary display.
Change-Id: I76300bac604e9e4b7be95b0872a7f95cb6781903
Reviewed-on: https://gerrit.libreoffice.org/4919
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/dictionaries b/dictionaries
index 43d2478..92a907a 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 43d24786db9947f0aababb1228379b0b3ece2652
+Subproject commit 92a907ab17814a8e08ab787745fefb85ed00d3f3
diff --git a/helpcontent2 b/helpcontent2
index d87de0c..a14b0de 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d87de0c383537470900fcd7dc78d534e1f9c3f7c
+Subproject commit a14b0defe8aec0eb8e80827e5c9cc76ebe742fd3
diff --git a/offapi/com/sun/star/awt/XToolkit.idl
b/offapi/com/sun/star/awt/XToolkit.idl
index 9c10b9f..1cff0b1 100644
--- a/offapi/com/sun/star/awt/XToolkit.idl
+++ b/offapi/com/sun/star/awt/XToolkit.idl
@@ -50,7 +50,11 @@ published interface XToolkit: com::sun::star::uno::XInterface
com::sun::star::awt::XWindowPeer getDesktopWindow();
-/** returns the complete work area for this toolkit.
+/**
+ * For LibreOffice versions 4.1, this method just returned an empty
rectangle.
+ * After that, it started returning a valid value.
+ *
+ * @returns the size and position of the primary display
*/
com::sun::star::awt::Rectangle getWorkArea();
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index f04e9f8..662906e 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -560,9 +560,14 @@ void SAL_CALL VCLXToolkit::disposing()
::com::sun::star::awt::Rectangle VCLXToolkit::getWorkArea( )
throw(::com::sun::star::uno::RuntimeException)
{
-::com::sun::star::awt::Rectangle aRect;
-// 07/00: AppWindow doesn't exist anymore...
-return aRect;
+sal_Int32 nDisplay = Application::GetDisplayBuiltInScreen();
+Rectangle aWorkRect = Application::GetScreenPosSizePixel( nDisplay );
+com::sun::star::awt::Rectangle aNotherRect;
+aNotherRect.X = aWorkRect.getX();
+aNotherRect.Y = aWorkRect.getY();
+aNotherRect.Width = aWorkRect.getWidth();
+aNotherRect.Height = aWorkRect.getHeight();
+return aNotherRect;
}
::com::sun::star::uno::Reference ::com::sun::star::awt::XWindowPeer
VCLXToolkit::createWindow( const ::com::sun::star::awt::WindowDescriptor
rDescriptor ) throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries helpcontent2 l10ntools/source translations
dictionaries |2 +-
helpcontent2 |2 +-
l10ntools/source/cfgmerge.cxx |7 ++-
l10ntools/source/export.cxx | 28 +++-
l10ntools/source/lngmerge.cxx |3 +--
l10ntools/source/xrmmerge.cxx |7 +++
translations |2 +-
7 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 5acc994f4ed3e118453fb493226b751a6d9d3bce
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 13 06:37:05 2013 +0200
Remove obsolote 'empty string - -' behaviour
Change-Id: I1d81d4c5716c397b84c0a8959b21beacbbbf1138
diff --git a/dictionaries b/dictionaries
index 36776c3..26b7c42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
diff --git a/helpcontent2 b/helpcontent2
index 4fa8716..f25d6a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4fa871622ae5cb247520fc113d2278be758fa62c
+Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 44f9896..dcbcfb9 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -500,8 +500,7 @@ void CfgMerge::WorkOnText(OString rText, const OString
rLangIndex)
OString sContent;
pEntrys-GetText( sContent, STRING_TYP_TEXT, rLangIndex );
-if ( !rLangIndex.equalsIgnoreAsciiCase(en-US)
-( sContent != - ) !sContent.isEmpty())
+if ( !rLangIndex.equalsIgnoreAsciiCase(en-US)
!sContent.isEmpty())
{
rText = helper::QuotHTML( rText );
}
@@ -530,9 +529,7 @@ void CfgMerge::WorkOnResourceEnd()
OString sContent;
pEntrys-GetText( sContent, STRING_TYP_TEXT, sCur , sal_True );
if (
-(
!sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(en-US)) )
-
-( sContent != - ) !sContent.isEmpty())
+( !sCur.equalsIgnoreAsciiCase(en-US) )
!sContent.isEmpty())
{
OString sText = helper::QuotHTML( sContent);
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 1cbb426..d4d6e04 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -919,26 +919,28 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool
bCreateNew )
sXQHText = pResData-sQuickHelpText[ SOURCE_LANGUAGE ];
sXTitle = pResData-sTitle[ SOURCE_LANGUAGE ];
-if (sXText.isEmpty())
-sXText = -;
-
-ConvertExportContent(sXText);
-ConvertExportContent(sXHText);
-ConvertExportContent(sXQHText);
-ConvertExportContent(sXTitle);
-
-common::writePoEntry(
-Transex3, *aOutput.mPo, global::inputPathname,
-pResData-sResTyp, sGID, sLID, sXHText, sXText);
+if( !sXText.isEmpty() )
+{
+ConvertExportContent(sXText);
+ConvertExportContent(sXHText);
+common::writePoEntry(
+Transex3, *aOutput.mPo, global::inputPathname,
+pResData-sResTyp, sGID, sLID, sXHText, sXText);
+}
if( !sXQHText.isEmpty() )
+{
+ConvertExportContent(sXQHText);
common::writePoEntry(
Transex3, *aOutput.mPo, global::inputPathname,
pResData-sResTyp,
sGID, sLID, OString(), sXQHText, PoEntry::TQUICKHELPTEXT );
-
+}
if( !sXTitle.isEmpty() )
+{
+ConvertExportContent(sXTitle);
common::writePoEntry(
Transex3, *aOutput.mPo, global::inputPathname,
pResData-sResTyp,
sGID, sLID, OString(), sXTitle, PoEntry::TTITLE );
+}
if ( bCreateNew ) {
pResData-sText[ SOURCE_LANGUAGE ] = ;
@@ -1508,7 +1510,7 @@ void Export::ResData2Output( MergeEntrys *pEntry,
sal_uInt16 nType, const OStrin
OString sText;
sal_Bool bText = pEntry-GetText( sText, nType, sCur , sal_True );
-if ( bText !sText.isEmpty() sText != - ) {
+if ( bText !sText.isEmpty() ) {
OString sOutput;
if ( bNextMustBeDefineEOL) {
if ( bFirst )
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index f343b26..273fe19 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -297,8 +297,7 @@ sal_Bool LngParser::Merge(
pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
if( sCur == qtz )
sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
-if (( !sNewText.isEmpty())
-!((
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM(x-comment))) ( sNewText == -
[Libreoffice-commits] core.git: dictionaries helpcontent2 sc/source
dictionaries |2 +-
helpcontent2 |2 +-
sc/source/filter/excel/xlpivot.cxx | 14 ++
3 files changed, 4 insertions(+), 14 deletions(-)
New commits:
commit 664dd908afe403836bdabc6da4f6fb0706b4f308
Author: Xisco Fauli aniste...@gmail.com
Date: Wed Mar 27 01:18:50 2013 +0100
Revert Fix #119514#:Item lists are incorrectly imported
This reverts commit 2d3f9fb97857fd8cfc732d3f5aa8f20b01e1cb35.
diff --git a/dictionaries b/dictionaries
index 350dc59..36776c3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad
+Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
diff --git a/helpcontent2 b/helpcontent2
index aab9e88..341ef99 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit aab9e2b7e799b6246caa6c40ca3d46e6220d
+Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b
diff --git a/sc/source/filter/excel/xlpivot.cxx
b/sc/source/filter/excel/xlpivot.cxx
index 8a902e0..84a6042 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -86,19 +86,9 @@ void XclPCItem::SetInteger( sal_Int16 nValue )
void XclPCItem::SetError( sal_uInt16 nError )
{
meType = EXC_PCITEM_ERROR;
+//! TODO convert error to string
maText = rtl::OUString();
mnError = nError;
-switch( nError )
-{
-case 0x00: maText = #NULL!; break;
-case 0x07: maText = #DIV/0!; break;
-case 0x0F: maText = #VALUE!; break;
-case 0x17: maText = #REF!; break;
-case 0x1D: maText = #NAME?; break;
-case 0x24: maText = #NUM!; break;
-case 0x2A: maText = #N/A; break;
-default: break;
-}
}
void XclPCItem::SetBool( bool bValue )
@@ -135,7 +125,7 @@ bool XclPCItem::IsEmpty() const
const rtl::OUString* XclPCItem::GetText() const
{
-return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? maText
: NULL;
+return (meType == EXC_PCITEM_TEXT) ? maText : 0;
}
const double* XclPCItem::GetDouble() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
