[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctfonts.cxx |8 1 file changed, 8 insertions(+) New commits: commit 4531a442454d81e140d720326f323cb5ad6ebfb5 Author: Tor Lillqvist Date: Tue Feb 18 09:56:09 2014 +0200 Fix iOS fallout from cda903f83831341f44833b94e7d38e598f5a7198 Change-Id: I48e418ff7d5a8bbf64bc6072b4ad2ef30cb24625 diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 9c37c65..e5c3f5931 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -305,6 +305,7 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool rDFA.mbSubsettable = true; // get font name +#ifdef MACOSX const OUString aUILang = Application::GetSettings().GetUILanguageTag().getLanguage(); CFStringRef pUILang = CFStringCreateWithCharacters( kCFAllocatorDefault, aUILang.getStr(), aUILang.getLength() ); CFStringRef pLang = NULL; @@ -314,6 +315,13 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool CFRelease( pFamilyName ); pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, kCTFontFamilyNameAttribute ); } +#else +// No "Application" on iOS. And it is unclear whether this code +// snippet will actually ever get invoked on iOS anyway. So just +// use the old code that uses a non-localized font name. +CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, kCTFontFamilyNameAttribute ); +#endif + rDFA.SetFamilyName( GetOUString( pFamilyName ) ); // get font style ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - extras/source
extras/source/wordbook/technical.dic |1 + 1 file changed, 1 insertion(+) New commits: commit 5a50ac78a14d8953ffe0c08e0d2c3dce6f4c80db Author: Andras Timar Date: Mon Feb 17 21:59:46 2014 +0100 add Collabora to wordbook Change-Id: I2d667a84ff1f1523f37895aacf6f97a0b34b7c03 Signed-off-by: Jan Holesovsky diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index c4509d4..2257cc2 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -37,6 +37,7 @@ Chrome Cisco= Clickstream= Cognos= +Collabora= Connect2OracleSelf= ConsoleOne ConText= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/osl/process/osl_Thread.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9c2b336b0e3bbbc4b73a81c0529cd45e273a0f38
Author: Stephan Bergmann
Date: Tue Feb 18 08:47:07 2014 +0100
C++03 fixup
Change-Id: I2a8b33adbc3844347e78738fbbf5a336af543e8a
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index f895a28..756df0b 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -84,8 +84,10 @@ StopWatch::StopWatch()
, m_bIsValid(false)
, m_bIsRunning(false)
{
-t1 = {0, 0};
-t2 = {0, 0};
+t1.Seconds = 0;
+t1.Nanosec = 0;
+t2.Seconds = 0;
+t2.Nanosec = 0;
}
void StopWatch::start()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/gvfs/gvfs_content.cxx |6 +++---
ucb/source/ucp/gvfs/gvfs_directory.cxx | 10 +-
ucb/source/ucp/gvfs/gvfs_directory.hxx |4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 80d9fbdde2a921958ec6725a1d80ba17fc5165c9
Author: Stephan Bergmann
Date: Tue Feb 18 08:43:24 2014 +0100
sal_Bool -> bool fixup
Change-Id: I4e69744d99334bfe9dafdfd19b2f0242ccf0d4cc
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx
b/ucb/source/ucp/gvfs/gvfs_content.cxx
index a2e5573..26f6ba8 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -318,10 +318,10 @@ uno::Any SAL_CALL Content::execute(
aRet <<= setPropertyValues( aProperties, xEnv );
} else if ( COMMAND_IS( aCommand, "getPropertySetInfo" ) ) {
-aRet <<= getPropertySetInfo( xEnv, sal_False );
+aRet <<= getPropertySetInfo( xEnv, false );
} else if ( COMMAND_IS( aCommand, "getCommandInfo" ) ) {
-aRet <<= getCommandInfo( xEnv, sal_False );
+aRet <<= getCommandInfo( xEnv, false );
} else if ( COMMAND_IS( aCommand, "open" ) ) {
ucb::OpenCommandArgument2 aOpenCommand;
@@ -650,7 +650,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendVoid( rProp );
else if ( rProp.Name == "IsVolume" || rProp.Name == "IsCompactDisk" )
-xRow->appendBoolean( rProp, sal_False );
+xRow->appendBoolean( rProp, false );
else if ( rProp.Name == "DateCreated" ) {
if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_CTIME)
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx
b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index 5871baa..21612a0 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -233,17 +233,17 @@ DataSupplier::queryContent( sal_uInt32 nIndex )
}
// virtual
-sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
+bool DataSupplier::getResult( sal_uInt32 nIndex )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
if ( m_pImpl->m_aResults.size() > nIndex ) // Result already present.
-return sal_True;
+return true;
if ( getData() && m_pImpl->m_aResults.size() > nIndex )
-return sal_True;
+return true;
-return sal_False;
+return false;
}
// virtual
@@ -264,7 +264,7 @@ sal_uInt32 DataSupplier::currentCount()
}
// virtual
-sal_Bool DataSupplier::isCountFinal()
+bool DataSupplier::isCountFinal()
{
osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
return m_pImpl->m_bCountFinal;
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx
b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index 37d6aa0..1ea9fa7 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx
@@ -66,11 +66,11 @@ public:
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
queryContent( sal_uInt32 nIndex );
-virtual sal_Bool getResult( sal_uInt32 nIndex );
+virtual bool getResult( sal_uInt32 nIndex );
virtual sal_uInt32totalCount();
virtual sal_uInt32currentCount();
-virtual sal_Bool isCountFinal();
+virtual bool isCountFinal();
virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
queryPropertyValues( sal_uInt32 nIndex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/ndgrf.hxx|6 +++---
sw/source/core/docnode/swbaslnk.cxx |6 +++---
sw/source/core/graphic/ndgrf.cxx|6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 5060d3888edba2be753eefbd4d23e1a2abd940ff
Author: Chr. Rossmanith
Date: Mon Feb 17 16:01:35 2014 +0100
Replace GrafikArrived with GraphicArrived
Change-Id: I626e0039a01e62eeae994b1c423cc6f8aa359c06
Reviewed-on: https://gerrit.libreoffice.org/8087
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index a2687d6..ba1d528 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
sal_Bool bTransparentFlagValid :1;
sal_Bool bInSwapIn :1;
-sal_Bool bGrafikArrived :1;
+sal_Bool bGraphicArrived:1;
sal_Bool bChgTwipSize :1;
sal_Bool bChgTwipSizeFromPixel :1;
sal_Bool bLoadLowResGrf :1;
@@ -150,8 +150,8 @@ public:
inline sal_Bool IsChgTwipSizeFromPixel() const { return
bChgTwipSizeFromPixel; }
inline void SetChgTwipSize( sal_Bool b, sal_Bool bFromPx=sal_False )
{ bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; }
-inline sal_Bool IsGrafikArrived() const { return bGrafikArrived; }
-inline void SetGrafikArrived( sal_Bool b ) { bGrafikArrived = b; }
+inline sal_Bool IsGraphicArrived() const { return bGraphicArrived;
}
+inline void SetGraphicArrived( sal_Bool b ) { bGraphicArrived = b; }
inline sal_Bool IsFrameInPaint() const { return bFrameInPaint; }
inline void SetFrameInPaint( sal_Bool b ) { bFrameInPaint = b; }
diff --git a/sw/source/core/docnode/swbaslnk.cxx
b/sw/source/core/docnode/swbaslnk.cxx
index 0bc7636..46341cb 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -140,7 +140,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem&
rItem )
bGraphicArrived = GetObj()->IsDataComplete();
bGraphicPieceArrived = GetObj()->IsPending();
-pSwGrfNode->SetGrafikArrived( bGraphicArrived );
+pSwGrfNode->SetGraphicArrived( bGraphicArrived );
Graphic aGrf;
if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGrf ) &&
@@ -248,8 +248,8 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem&
rItem )
pBLink->DataChanged( rMimeType, rValue );
pBLink->bIgnoreDataChanged = sal_True;
-pGrfNd->SetGrafikArrived( ((SwGrfNode*)pCntntNode)->
-IsGrafikArrived() );
+pGrfNd->SetGraphicArrived( ((SwGrfNode*)pCntntNode)->
+IsGraphicArrived() );
// Adjust the Fly's graphic
if( !::SetGrfFlySize( aGrfSz, aFrmFmtSz, pGrfNd ) )
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index e80904d..c7da2f1 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -73,7 +73,7 @@ SwGrfNode::SwGrfNode(
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
bFrameInPaint = bScaleImageMap = sal_False;
-bGrafikArrived = sal_True;
+bGraphicArrived = sal_True;
// fdo#50763 inline image has already been read into memory
if (rGrfName.startsWith("data:")) {
@@ -99,7 +99,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
maGrfObj.SetSwapState();
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
bFrameInPaint = bScaleImageMap = sal_False;
-bGrafikArrived = sal_True;
+bGraphicArrived = sal_True;
}
/** Create new SW/G reader.
@@ -126,7 +126,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
bFrameInPaint = bScaleImageMap = sal_False;
-bGrafikArrived = sal_True;
+bGraphicArrived = sal_True;
InsertLink( rGrfName, rFltName );
if( IsLinkedFile() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - filter/source i18nutil/source include/i18nutil include/tools sfx2/source sw/source tools/source UnoControls/inc UnoControls/source
UnoControls/inc/basecontrol.hxx|6 -
UnoControls/source/base/basecontrol.cxx| 12 +--
UnoControls/source/controls/OConnectionPointHelper.cxx | 10 +-
UnoControls/source/controls/framecontrol.cxx |8 +-
UnoControls/source/controls/progressbar.cxx|4 -
UnoControls/source/controls/progressmonitor.cxx| 26 +++---
UnoControls/source/inc/OConnectionPointHelper.hxx |2
UnoControls/source/inc/progressbar.hxx |4 -
UnoControls/source/inc/progressmonitor.hxx |6 -
filter/source/msfilter/svdfppt.cxx |6 -
i18nutil/source/utility/casefolding.cxx|2
i18nutil/source/utility/unicode.cxx|4 -
i18nutil/source/utility/widthfolding.cxx | 10 +-
include/i18nutil/unicode.hxx | 18 ++--
include/i18nutil/widthfolding.hxx |4 -
include/tools/bigint.hxx | 40 +-
include/tools/ref.hxx |4 -
include/tools/rtti.hxx | 18 ++--
include/tools/stream.hxx |2
sfx2/source/appl/lnkbase2.cxx |2
sw/source/core/docnode/swbaslnk.cxx|2
tools/source/generic/bigint.cxx| 66 -
22 files changed, 128 insertions(+), 128 deletions(-)
New commits:
commit 736b3970e7a49e0b11997602703852a7a5c0fdc3
Author: Stephan Bergmann
Date: Tue Feb 18 07:20:00 2014 +0100
i18nutil: sal_Bool -> bool
Change-Id: Ic4a198d737692734ae3fbc096f370a3aa0667c5b
diff --git a/i18nutil/source/utility/casefolding.cxx
b/i18nutil/source/utility/casefolding.cxx
index c0f58d3..cbe7ea9 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -108,7 +108,7 @@ Mapping& casefolding::getValue(const sal_Unicode* str,
sal_Int32 pos, sal_Int32
return dummy;
}
-inline sal_Bool SAL_CALL
+inline bool SAL_CALL
is_ja_voice_sound_mark(sal_Unicode& current, sal_Unicode next)
{
sal_Unicode c = 0;
diff --git a/i18nutil/source/utility/unicode.cxx
b/i18nutil/source/utility/unicode.cxx
index ff92805..edea198 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -378,7 +378,7 @@ unicode::getUnicodeDirection( const sal_Unicode ch ) {
bit(UnicodeType::PARAGRAPH_SEPARATOR)
#define IsType(func, mask) \
-sal_Bool SAL_CALL func( const sal_Unicode ch) {\
+bool SAL_CALL func( const sal_Unicode ch) {\
return (bit(getUnicodeType(ch)) & (mask)) != 0;\
}
@@ -389,7 +389,7 @@ IsType(unicode::isSpace, SPACEMASK)
#define CONTROLSPACEbit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\
bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f)
-sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) {
+bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) {
return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) &
(CONTROLSPACE)));
}
diff --git a/i18nutil/source/utility/widthfolding.cxx
b/i18nutil/source/utility/widthfolding.cxx
index a7ecb98..2d3fcb1 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.cxx
@@ -41,7 +41,7 @@ sal_Unicode
widthfolding::decompose_ja_voiced_sound_marksChar2Char (sal_Unicode
/**
* Decompose Japanese specific voiced and semi-voiced sound marks.
*/
-OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr,
sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool
useOffset )
+OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr,
sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool
useOffset )
{
// Create a string buffer which can hold nCount * 2 + 1 characters.
// Its size may become double of nCount.
@@ -103,7 +103,7 @@ oneToOneMapping& widthfolding::getfull2halfTable(void)
/**
* Compose Japanese specific voiced and semi-voiced sound marks.
*/
-OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr,
sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool
useOffset, sal_Int32 nFlags )
+OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr,
sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool
useOffset, sal_Int32 nFlags )
{
// Create a string buffer which can hold nCount + 1 characters.
// Its size may become equal to nCount or smaller.
@@ -157,14 +157,14 @@ OUString widthfolding::compose_ja_voiced_sound_marks
(const OUString& inStr, sal
// 0 addresses a code point regarding 0x3099 or 0x309b (voiced sound
mark),
// 1 is 0x309a or 0x309c (semi-voiced sound mark)
int i = int(previousChar - 0x3040); // i acts as an index of array
- sal_Bool bC
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sal/inc sal/util
sal/inc/rtl/string.hxx |2 ++
sal/inc/rtl/ustring.hxx | 15 +++
sal/util/sal.map|7 ++-
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit fb2c25a7b82f38fb286c25cb33fcbc5247008d26
Author: Muthu Subramanian
Date: Tue Feb 18 12:49:05 2014 +0530
String cleanups.
Change-Id: Ia4a9630822678a7b9ea6e5af87e58cfd0ebacff3
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 4b7b072..e9a9342 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -872,6 +872,8 @@ public:
@return a hash code value of the string data
@see hashCode() for simple hashes
+
+ @since LibreOffice 4.3
*/
sal_uInt64 hashCode64() const SAL_THROW(())
{
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 36295116..1f75101 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1168,6 +1168,21 @@ public:
}
/**
+ Returns a 64bit hash of the string data.
+ This hashes the entire data, while hashCode would do sampling for larger
string sizes.
+
+ @return a hash code value of the string data
+
+ @see hashCode() for simple hashes
+
+ @since LibreOffice 4.3
+*/
+sal_uInt64 hashCode64() const SAL_THROW(())
+{
+return rtl_ustr_hashCode64_WithLength( pData->buffer, pData->length );
+}
+
+/**
Returns a hashcode for this string.
@return a hash code value for this object.
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 83d824c..7ab421f 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -221,7 +221,6 @@ UDK_3_0_0 {
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength;
rtl_str_hashCode;
rtl_str_hashCode_WithLength;
-rtl_str_hashCode64_WithLength;
rtl_str_indexOfChar;
rtl_str_indexOfChar_WithLength;
rtl_str_indexOfStr;
@@ -653,6 +652,12 @@ LIBO_UDK_4.0 { # symbols available in >= LibO 4.0
rtl_uString_newReplaceAllFromIndex;
} LIBO_UDK_3.6;
+LIBO_UDK_4.3 { #symbols available in >= LibO 4.3
+global:
+ rtl_str_hashCode64_WithLength;
+ rtl_ustr_hashCode64_WithLength;
+} LIBO_UDK_4.2;
+
PRIVATE_1.0 {
global:
osl_detail_ObjectRegistry_storeAddresses;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: math syntax highlighting
On Mon, Feb 17, 2014 at 6:52 PM, Jose Guilherme Vanz wrote: > Hi > > I started to work on the math syntax highlighting. Actually, I can identify > when we have some problems with parenthesis without close and etc. Now, I > would like to change the color or background color to show to the user the > problematic character. How can I change the color of the string? Is there > some field in the OUString that can I do that? No OUString does not carry any formatting information.. it is merely a glorified UTF-16 sequence of character... otoh there are SetColor/SetBackgroundColor api generaly associated with the object that involved in rendering the string, like the font... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/filter/html/parcss1.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de80818fb1b5084a367eea82d6e378b399c09ce2 Author: Jan Holesovsky Date: Mon Feb 17 20:49:24 2014 +0100 Fix crash in css rgb color handling. Crashing since 2000 (or earlier). Change-Id: I9f91d56f380be2421370b0acbee351461e1f0973 Reviewed-on: https://gerrit.libreoffice.org/8091 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index c498db9..575351e 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -1279,7 +1279,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const ')' == aValue[aValue.getLength()-1], "keine gueltiges RGB(...)" ); -OUString aColorStr( aValue.copy( 4, aValue.getLength()-1 ) ); +OUString aColorStr(aValue.copy(4, aValue.getLength() - 5)); sal_Int32 nPos = 0; sal_uInt16 nCol = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctfonts.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit cda903f83831341f44833b94e7d38e598f5a7198
Author: Tomofumi Yagi
Date: Sat Feb 15 11:48:20 2014 +0900
fdo#72042: Fix for "Font names are not localized (Mac OS X)"
This patch will bring the behavior of 4.0 to master(4.3).
This patch has 1 changes on implementation of vcl/quartz/ctfonts.cxx.
We will use CTFontDescriptorCopyLocalizedAttribute() API,If possible.
So DevFontFromCTFontDescriptor() can return the localized fontname.
Change-Id: I7eb5bda4fa69540fb32de573190a30bcb2c01cd2
Reviewed-on: https://gerrit.libreoffice.org/8071
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index fffd680..9c37c65 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -305,8 +305,17 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor(
CTFontDescriptorRef pFD, bool
rDFA.mbSubsettable = true;
// get font name
-CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD,
kCTFontFamilyNameAttribute );
+const OUString aUILang =
Application::GetSettings().GetUILanguageTag().getLanguage();
+CFStringRef pUILang = CFStringCreateWithCharacters( kCFAllocatorDefault,
aUILang.getStr(), aUILang.getLength() );
+CFStringRef pLang = NULL;
+CFStringRef pFamilyName =
(CFStringRef)CTFontDescriptorCopyLocalizedAttribute( pFD,
kCTFontFamilyNameAttribute, &pLang );
+if ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo )
+{
+CFRelease( pFamilyName );
+pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD,
kCTFontFamilyNameAttribute );
+}
rDFA.SetFamilyName( GetOUString( pFamilyName ) );
+
// get font style
CFStringRef pStyleName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD,
kCTFontStyleNameAttribute );
rDFA.SetStyleName( GetOUString( pStyleName ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 suokunl...@gmail.com changed: What|Removed |Added Depends on||75130 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-02-18
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Replace handwritten reference counting with stl shared_ptr in https://gerrit.libreoffice.org/7934 from Tobias Lippert about module include, vcl + Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx in https://gerrit.libreoffice.org/7933 from Tobias Lippert about module accessibility, avmedia, basctl, basic, chart2, cui, dbaccess, desktop, drawinglayer, editeng, extensions, filter, forms, formula, fpicker, framework, include, oox, padmin, reportdesign, sc, scripting, sd, sdext, sfx2, slideshow, starmath, svtools, svx, sw, toolkit, uui, vcl, writerfilter, xmlsecurity + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji about module sw + fdo#74271: Added unit test & code changes for footer contains hyperlink. in https://gerrit.libreoffice.org/7766 from Yogesh Bharate about module include, sw End of freshness + fdo#72042: Fix for "Font names are not localized (Mac OS X)" in https://gerrit.libreoffice.org/8071 from Tomofumi Yagi about module vcl + Do not throw when a singleton can't be raised, only warn. in https://gerrit.libreoffice.org/8088 from Matúš Kukan about module cppuhelper + Replace GrafikArrived with GraphicArrived in https://gerrit.libreoffice.org/8087 from Christina Roßmanith about module sw + fdo#73596 [DOCX] Multiple Columns in Index in https://gerrit.libreoffice.org/8047 from Vinaya Mandke about module sw, writerfilter + fdo#74595 Make HTML detection to follow specs in https://gerrit.libreoffice.org/8079 from Maxim Monastirsky about module filter * Merged changes on master for project core changed in the last 25 hours: + fdo#60924: Move more libs/packages to autoinstall in https://gerrit.libreoffice.org/8006 from Marcos Souza + fdo#63154 Remove unused solar.h reference in sw. in https://gerrit.libreoffice.org/8067 from Alexandre Vicenzi * Abandoned changes on master for project core changed in the last 25 hours: + Test for fdo#74824. in https://gerrit.libreoffice.org/8078 from Kevin Hunter Kesling * Open changes needing tweaks, but being untouched for more than a week: + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate "Paste Special" entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/lib
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/xestream.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6e600952403dacbcbf684a30b48ff5c4765ec55 Author: Markus Mohrhard Date: Tue Feb 18 02:23:59 2014 +0100 the string is UTF8 and not Ascii Change-Id: Ibf9a837ca5689ceae91eff2a081da3b7fe0b9244 Reviewed-on: https://gerrit.libreoffice.org/8094 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 795f86ba..97676df 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1016,7 +1016,7 @@ sax_fastparser::FSHelperPtr& XclExpXmlStream::WriteAttributesInternal( sal_Int32 rStream->write( " " ) ->writeId( nAttribute ) ->write( "=\"" ) -->writeEscaped( pValue ) +->writeEscaped( OUString(pValue, std::strlen(pValue), RTL_TEXTENCODING_UTF8) ) ->write( "\"" ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sal/qa sc/inc sc/source
sal/qa/osl/process/osl_Thread.cxx | 11 ++-
sc/inc/colorscale.hxx |4 +++-
sc/source/core/data/conditio.cxx |5 +++--
sc/source/core/tool/orcusxml.cxx |9 +++--
4 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 416d0453c5dcf2802eecdec59b6e85d5b097c55b
Author: Norbert Thiebaud
Date: Mon Feb 17 23:13:16 2014 -0600
coverity#984129 Uninitialized scalar field
Change-Id: Ia7b1a6aa15dd2438ebb39739535c4dfe0836e785
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index f252556..f895a28 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -1901,6 +1901,7 @@ public:
char m_Char_Test;
// for pass thread-special data to thread
myKeyThread(const char cData)
+: m_Char_Test(0)
{
m_nData = cData;
}
commit 34af1079f4ee6b63bdb6c634c3c5b6893e92bc1e
Author: Norbert Thiebaud
Date: Mon Feb 17 22:54:06 2014 -0600
coverity#984130 Uninitialized scalar field
Change-Id: I6ebb1078c44b5fc0140ee59dc16a2bd7c7188453
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index c45b554..f252556 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -78,7 +78,15 @@ public:
// A small stopwatch for internal use
// (c) Lars Langhans 29.12.1996 22:10
-StopWatch::StopWatch():m_bIsValid(false),m_bIsRunning(false) {}
+StopWatch::StopWatch()
+: m_nNanoSec(0)
+, m_nSeconds(0)
+, m_bIsValid(false)
+, m_bIsRunning(false)
+{
+t1 = {0, 0};
+t2 = {0, 0};
+}
void StopWatch::start()
{
commit dd0081bdff211e551eac4ac5a36b60f92b57ef86
Author: Norbert Thiebaud
Date: Mon Feb 17 22:47:13 2014 -0600
coverity#984132 Uninitialized scalar field
Change-Id: I2e483d1612e2344b71e0d140bf1fe264fbf9b0e3
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 9dcce78..067a5a5 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -311,8 +311,10 @@ struct ScIconSetFormatData
boost::ptr_vector maEntries;
ScIconSetFormatData():
+eIconSetType(IconSet_3Arrows),
mbShowValue(true),
-mbReverse(false) {}
+mbReverse(false)
+{}
};
class SC_DLLPUBLIC ScIconSetFormat : public ScColorFormat
commit 3920bb664a1d60c3b32f8ff7e9bf6776581ef8b0
Author: Norbert Thiebaud
Date: Mon Feb 17 22:39:08 2014 -0600
coverity#984133 Uninitialized scalar field
Change-Id: I933aa0d34d99808ccc359acfd895a7b9ea60217c
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 3d2b0c7..5974b8f 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1599,8 +1599,9 @@ ScFormatEntry* ScCondFormatEntry::Clone( ScDocument* pDoc
) const
//
-ScCondDateFormatEntry::ScCondDateFormatEntry( ScDocument* pDoc ):
-ScFormatEntry( pDoc )
+ScCondDateFormatEntry::ScCondDateFormatEntry( ScDocument* pDoc )
+: ScFormatEntry( pDoc )
+, meType(condformat::TODAY)
{
}
commit d908a33013014fa198cf3d14c1b02b69df2a1323
Author: Norbert Thiebaud
Date: Mon Feb 17 22:32:55 2014 -0600
coverity#984134 Uninitialized scalar field
Change-Id: Iafc65bc7d168a1750dd25cbd629762362bc73af5
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index c4a7b77..b5f51b4 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -13,8 +13,13 @@
#include "svtools/treelistentry.hxx"
#include "rtl/strbuf.hxx"
-ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
-meType(eType), maLinkedPos(ScAddress::INITIALIZE_INVALID),
mbRangeParent(false), mbLeafNode(true) {}
+ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType)
+: mnNamespaceID(0)
+, meType(eType)
+, maLinkedPos(ScAddress::INITIALIZE_INVALID)
+, mbRangeParent(false)
+, mbLeafNode(true)
+{}
ScOrcusXMLTreeParam::EntryData*
ScOrcusXMLTreeParam::getUserData(SvTreeListEntry& rEntry)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68148, which changed state. Bug 68148 Summary: single line cell borders turn dashed when opened with different LibO release https://bugs.freedesktop.org/show_bug.cgi?id=68148 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68148, which changed state. Bug 68148 Summary: single line cell borders turn dashed when opened with different LibO release https://bugs.freedesktop.org/show_bug.cgi?id=68148 What|Removed |Added Status|RESOLVED|UNCONFIRMED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source editeng/source extensions/source forms/source fpicker/source framework/inc include/avmedia include/formula l10ntools/inc linguistic/source lotuswordpro/s
desktop/source/deployment/gui/dp_gui.h|3 ---
desktop/source/deployment/gui/dp_gui_updatedialog.cxx |1 -
desktop/source/deployment/gui/dp_gui_updatedialog.hxx |1 -
desktop/source/deployment/inc/dp_resource.h |1 -
desktop/source/deployment/registry/dp_registry.cxx|1 -
desktop/source/deployment/registry/inc/dp_backend.h |1 -
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx |1 -
editeng/source/misc/unolingu.cxx |4
extensions/source/propctrlr/standardcontrol.cxx |1 -
forms/source/inc/FormComponent.hxx|2 --
forms/source/richtext/richtextimplcontrol.cxx |2 --
forms/source/richtext/richtextvclcontrol.cxx |1 -
forms/source/solar/control/navtoolbar.cxx |1 -
forms/source/xforms/binding.hxx |1 -
forms/source/xforms/convert.cxx |1 -
fpicker/source/aqua/SalAquaFilePicker.hxx |3 ---
fpicker/source/aqua/SalAquaFolderPicker.hxx |4
framework/inc/uielement/generictoolbarcontroller.hxx |1 -
include/avmedia/mediawindow.hxx |1 -
include/formula/token.hxx |2 --
l10ntools/inc/helpmerge.hxx |1 -
linguistic/source/dlistimp.hxx|1 -
lotuswordpro/source/filter/lwpsvstream.cxx|1 -
23 files changed, 36 deletions(-)
New commits:
commit d548b250dbd74247d7c5c7b220a38e93cb19053d
Author: Takeshi Abe
Date: Tue Feb 18 13:21:58 2014 +0900
Drop unnecessary #include
Change-Id: Ib9ab63cdf21f54b1611de37c5538a300a1b39ba6
diff --git a/desktop/source/deployment/gui/dp_gui.h
b/desktop/source/deployment/gui/dp_gui.h
index 4a09cc3..f876205 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -36,9 +36,6 @@
#include "svtools/headbar.hxx"
#include "com/sun/star/ucb/XContentEventListener.hpp"
#include "osl/mutex.hxx"
-#include
-#include
-#include
namespace com { namespace sun { namespace star {
namespace container {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 4356660..3bae5ce 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -23,7 +23,6 @@
#include
#include
#include
-#include
#include
#include
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index b5dfa20..b19e575 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include
#include
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/Sequence.hxx"
diff --git a/desktop/source/deployment/inc/dp_resource.h
b/desktop/source/deployment/inc/dp_resource.h
index 8602df2..f1390ad5 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -23,7 +23,6 @@
#include "tools/resid.hxx"
#include
#include "dp_misc.h"
-#include
#include "dp_misc_api.hxx"
namespace dp_misc {
diff --git a/desktop/source/deployment/registry/dp_registry.cxx
b/desktop/source/deployment/registry/dp_registry.cxx
index 7fae937..cc15848 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -42,7 +42,6 @@
#include
#include
#include
-#include
using namespace ::dp_misc;
using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h
b/desktop/source/deployment/registry/inc/dp_backend.h
index f0e29fb0..2c8a417 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -33,7 +33,6 @@
#include "com/sun/star/deployment/XPackageRegistry.hpp"
#include "com/sun/star/deployment/XPackageManager.hpp"
#include "com/sun/star/deployment/InvalidRemovedParameterException.hpp"
-#include
#include
#include
#include "dp_registry.hrc"
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 3189801..7486909 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -29,7 +29,6 @@
#include
#include
#include
-#include
using namespace ::dp_misc;
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index cd7e378..cb38e7a 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -18,10 +18,6 @@
*/
-#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/ext
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/qa sc/source
sc/inc/column.hxx |2
sc/inc/mtvcellfunc.hxx | 11 +++
sc/qa/unit/ucalc.cxx| 19 ++
sc/qa/unit/ucalc.hxx|2
sc/source/core/data/column2.cxx | 111 +---
sc/source/ui/undo/undoblk.cxx |5 -
6 files changed, 71 insertions(+), 79 deletions(-)
New commits:
commit 894884400138a811a043602aa9db32c42487212d
Author: Kohei Yoshida
Date: Mon Feb 17 22:22:35 2014 -0500
Temporarily disable this test. I'll fix this later.
Change-Id: I5e4f3559e462e069aad8050e3331b9f546729f7c
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 01cb908..242d2c1 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -411,7 +411,7 @@ public:
CPPUNIT_TEST(testCopyPaste);
CPPUNIT_TEST(testCopyPasteAsLink);
CPPUNIT_TEST(testCopyPasteTranspose);
-CPPUNIT_TEST(testCopyPasteSkipEmpty);
+// CPPUNIT_TEST(testCopyPasteSkipEmpty); TODO : fix this later
//CPPUNIT_TEST(testCopyPasteSkipEmptyConditionalFormatting);
CPPUNIT_TEST(testUndoCut);
CPPUNIT_TEST(testMoveBlock);
commit 575e88da278f536ebfb6562dfd98f341240afec4
Author: Kohei Yoshida
Date: Mon Feb 17 21:57:01 2014 -0500
fdo#75032: Handle note copying correctly.
Change-Id: I1b8fa5231b23554c856fb63b580cb13ea9223b08
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7f91d90..9b36270 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -171,6 +171,8 @@ public:
const sc::CellStoreType& GetCellStore() const { return maCells; }
sc::CellTextAttrStoreType& GetCellAttrStore() { return maCellTextAttrs; }
const sc::CellTextAttrStoreType& GetCellAttrStore() const { return
maCellTextAttrs; }
+sc::CellNoteStoreType& GetCellNoteStore() { return maCellNotes; }
+const sc::CellNoteStoreType& GetCellNoteStore() const { return
maCellNotes; }
ScRefCellValue GetCellValue( SCROW nRow ) const;
ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator&
itPos, size_t nOffset ) const;
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index fc6d2dc..d5e7921 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -166,6 +166,17 @@ void ProcessNote(CellNoteStoreType& rStore, _Func& rFunc)
ProcessElements1 >(rStore, rFunc, aElse);
}
+template
+typename CellNoteStoreType::const_iterator
+ParseNote(
+const CellNoteStoreType::const_iterator& itPos, const CellNoteStoreType&
rStore,
+SCROW nStart, SCROW nEnd, _Func& rFunc)
+{
+FuncElseNoOp aElse;
+return ParseElements1 >(
+itPos, rStore, nStart, nEnd, rFunc, aElse);
+}
+
template
typename CellNoteStoreType::iterator
ProcessNote(
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 6390979..e203878 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1644,85 +1644,48 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1,
SCROW nRow2, ScColumn& r
}
}
-void ScColumn::CopyCellNotesToDocument(
-SCROW nRow1, SCROW nRow2, ScColumn& rDestCol, bool bCloneCaption, SCROW
nRowOffsetDest ) const
-{
-SCCOL nDestCol = rDestCol.GetCol();
-SCTAB nDestTab = rDestCol.GetTab();
-
-rDestCol.maCellNotes.set_empty(nRow1 + nRowOffsetDest, nRow2 +
nRowOffsetDest); // Empty the destination range first.
+namespace {
-sc::CellNoteStoreType::const_iterator itBlk = maCellNotes.begin(),
itBlkEnd = maCellNotes.end();
+class CopyCellNotesHandler
+{
+ScColumn& mrDestCol;
+sc::CellNoteStoreType& mrDestNotes;
+sc::CellNoteStoreType::iterator miPos;
+SCTAB mnSrcTab;
+SCCOL mnSrcCol;
+SCTAB mnDestTab;
+SCCOL mnDestCol;
+SCROW mnDestOffset; /// Add this to the source row position to get the
destination row.
+bool mbCloneCaption;
-// Locate the top row position.
-size_t nOffsetInBlock = 0;
-size_t nBlockStart = 0, nBlockEnd = 0, nRowPos =
static_cast(nRow1);
-for (; itBlk != itBlkEnd; ++itBlk, nBlockStart = nBlockEnd)
-{
-nBlockEnd = nBlockStart + itBlk->size;
-if (nBlockStart <= nRowPos && nRowPos < nBlockEnd)
-{
-// Found.
-nOffsetInBlock = nRowPos - nBlockStart;
-break;
-}
+public:
+CopyCellNotesHandler( const ScColumn& rSrcCol, ScColumn& rDestCol, SCROW
nDestOffset, bool bCloneCaption ) :
+mrDestCol(rDestCol),
+mrDestNotes(rDestCol.GetCellNoteStore()),
+miPos(mrDestNotes.begin()),
+mnSrcTab(rSrcCol.GetTab()),
+mnSrcCol(rSrcCol.GetCol()),
+mnDestTab(rDestCol.GetTab()),
+mnDestCol(rDestCol.GetCol()),
+mnDestOffset(nDestOffset),
+mbCloneCaption(bCloneCaption) {}
+
+void operator() ( size_t nRow, const ScPostIt* p )
+{
+SCROW nDestRow = nRow + mnDestOffset;
+ScAddress aSrcPos(mnSrcCol, nRow, mnSrcTab);
+ScAddress aDestPos(mnDestCol, nDestRow, mnDestTab);
+miPos = mrDest
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/OpenGLRender.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1388b658cab36e9e1c94821063fb3573d3f7654b Author: Markus Mohrhard Date: Tue Feb 18 04:12:27 2014 +0100 we should not enable the png debug export by default Change-Id: Iaf8873b32b40db911aa07e910b4070b37b3277ea diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 4d0f25e..83d68bd 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; using namespace std; -#define DEBUG_PNG 1 +#define DEBUG_PNG 0 #if RENDER_TO_FILE #define BMP_HEADER_LEN 54 #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/AColumn.cxx|2 +-
connectivity/source/drivers/jdbc/JStatement.cxx|2 +-
connectivity/source/drivers/jdbc/PreparedStatement.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d20ffc370bc1b946366d4cb1073b815beda706a2
Author: Markus Mohrhard
Date: Tue Feb 18 04:03:42 2014 +0100
fix windows build
Change-Id: Ibbeda9f66ee9c81ac4202f999173adbf00ed8f83
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index 1e6ab61..8207916 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32
nHandle,const Any& r
break;
case PROPERTY_ID_ISAUTOINCREMENT:
-OTools::putValue( m_aColumn.get_Properties(), OUString(
"Autoincrement" ), getBOOL( rValue ) );
+OTools::putValue( m_aColumn.get_Properties(), OUString(
"Autoincrement" ), (sal_Bool)getBOOL( rValue ) );
break;
case PROPERTY_ID_IM001:
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx
b/connectivity/source/drivers/jdbc/JStatement.cxx
index d4ec589..7bfb0cb 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -505,7 +505,7 @@ void java_sql_Statement_Base::setEscapeProcessing(sal_Bool
_par0) throw(SQLExcep
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
-m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, _par0 );
+m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, (bool)_par0
);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
m_bEscapeProcessing = _par0;
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 774d130..9843884 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -161,7 +161,7 @@ void SAL_CALL java_sql_PreparedStatement::setString(
sal_Int32 parameterIndex, c
void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32
parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
-m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex,
x );
+m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex,
(bool)x );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx | 67 +++
sc/qa/unit/ucalc.hxx |2 +
2 files changed, 69 insertions(+)
New commits:
commit 5915d38e84c7a7861c169bea18c63824bcfdc470
Author: Markus Mohrhard
Date: Tue Feb 18 03:32:02 2014 +0100
add disabled test for conditional formatting with skip empty cells
Change-Id: I01920c1e27a1c9b0445524bc51292a48a6827877
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 14dffd9..7b4321f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3883,6 +3883,73 @@ void Test::testCopyPasteSkipEmpty()
m_pDoc->DeleteTab(0);
}
+void Test::testCopyPasteSkipEmptyConditionalFormatting()
+{
+m_pDoc->InsertTab(0, "Test");
+
+ScRange aDestRange(0,0,0,1,2,0);
+ScRange aSrcRange(3,3,0,5,4,0);
+
+ScMarkData aMark;
+aMark.SetMarkArea(aDestRange);
+
+m_pDoc->SetValue(0,0,0,1);
+m_pDoc->SetValue(1,0,0,1);
+m_pDoc->SetValue(0,1,0,1);
+m_pDoc->SetValue(0,2,0,1);
+m_pDoc->SetValue(1,2,0,1);
+
+//create conditional formatting for A1:B3
+ScConditionalFormatList* pCondFormatList = new ScConditionalFormatList();
+m_pDoc->SetCondFormList(pCondFormatList, 0);
+
+ScConditionalFormat* pFormat = new ScConditionalFormat(1, m_pDoc);
+pFormat->AddRange(aDestRange);
+sal_uLong nCondFormatKey = m_pDoc->AddCondFormat(pFormat, 0);
+
+// Prepare a clipboard content interleaved with empty cells.
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+aClipDoc.ResetClip(m_pDoc, &aMark);
+ScClipParam aParam(aSrcRange, false);
+aClipDoc.SetClipParam(aParam);
+aClipDoc.SetValue(3,3,0,2);
+aClipDoc.SetValue(4,3,0,2);
+aClipDoc.SetValue(4,4,0,2);
+aClipDoc.SetValue(3,5,0,2);
+aClipDoc.SetValue(4,5,0,2);
+
+ScConditionalFormat* pClipFormat = new ScConditionalFormat(2, &aClipDoc);
+pClipFormat->AddRange(aSrcRange);
+aClipDoc.AddCondFormat(pClipFormat, 0);
+
+// Create undo document.
+ScDocument* pUndoDoc = new ScDocument(SCDOCMODE_UNDO);
+pUndoDoc->InitUndo(m_pDoc, 0, 0);
+m_pDoc->CopyToDocument(aDestRange, IDF_CONTENTS, false, pUndoDoc, &aMark);
+
+// Paste clipboard content onto A1:A5 but skip empty cells.
+bool bSkipEmpty = true;
+m_pDoc->CopyFromClip(aDestRange, aMark, IDF_CONTENTS, pUndoDoc, &aClipDoc,
true, false, false, bSkipEmpty);
+
+ScConditionalFormatList* pList = m_pDoc->GetCondFormList(0);
+CPPUNIT_ASSERT_EQUAL(size_t(2), pList->size());
+CPPUNIT_ASSERT(m_pDoc->GetCondFormat(1,1,0));
+// empty cell in copy area does not overwrite conditional formatting
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(nCondFormatKey),
m_pDoc->GetCondFormat(1,1,0)->GetKey());
+for(SCCOL nCol = 0; nCol <= 1; ++nCol)
+{
+for(SCROW nRow = 0; nRow <= 2; ++nRow)
+{
+if(nRow == 1 && nCol == 1)
+continue;
+
+CPPUNIT_ASSERT(m_pDoc->GetCondFormat(nCol, nRow, 0));
+CPPUNIT_ASSERT(nCondFormatKey != m_pDoc->GetCondFormat(nCol, nRow,
0)->GetKey());
+}
+}
+m_pDoc->DeleteTab(0);
+}
+
void Test::testUndoCut()
{
m_pDoc->InsertTab(0, "Test");
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 2e57b31..01cb908 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -244,6 +244,7 @@ public:
void testCopyPasteAsLink();
void testCopyPasteTranspose();
void testCopyPasteSkipEmpty();
+void testCopyPasteSkipEmptyConditionalFormatting();
void testUndoCut();
void testMoveBlock();
void testCopyPasteRelativeFormula();
@@ -411,6 +412,7 @@ public:
CPPUNIT_TEST(testCopyPasteAsLink);
CPPUNIT_TEST(testCopyPasteTranspose);
CPPUNIT_TEST(testCopyPasteSkipEmpty);
+//CPPUNIT_TEST(testCopyPasteSkipEmptyConditionalFormatting);
CPPUNIT_TEST(testUndoCut);
CPPUNIT_TEST(testMoveBlock);
CPPUNIT_TEST(testCopyPasteRelativeFormula);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - oox/source sc/source
oox/source/export/chartexport.cxx | 63 +---
sc/source/filter/excel/xestream.cxx |2 -
2 files changed, 38 insertions(+), 27 deletions(-)
New commits:
commit b57bad8422c0efee8a42660806765f36746bb2fe
Author: Markus Mohrhard
Date: Tue Feb 18 02:23:59 2014 +0100
the string is UTF8 and not Ascii
Change-Id: Ibf9a837ca5689ceae91eff2a081da3b7fe0b9244
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 77c6295..30d774f 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1016,7 +1016,7 @@ sax_fastparser::FSHelperPtr&
XclExpXmlStream::WriteAttributesInternal( sal_Int32
rStream->write( " " )
->writeId( nAttribute )
->write( "=\"" )
-->writeEscaped( pValue )
+->writeEscaped( OUString(pValue, std::strlen(pValue),
RTL_TEXTENCODING_UTF8) )
->write( "\"" );
}
commit 53146f93ad0697a7af8b312bfbe424c1066207a1
Author: Markus Mohrhard
Date: Tue Feb 18 02:22:07 2014 +0100
prevent invalid OOXML files with trendlines, related #i88825#
Change-Id: I503b24233060400cf4bbb40701bec0a3e101512a
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index b427868..7fea8e3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2801,6 +2801,21 @@ void ChartExport::exportTrendlines( Reference<
chart2::XDataSeries > xSeries )
Reference< XPropertySet > xProperties( xRegCurve , uno::UNO_QUERY
);
+OUString aService;
+Reference< lang::XServiceName > xServiceName( xProperties,
UNO_QUERY );
+if( !xServiceName.is() )
+continue;
+
+aService = xServiceName->getServiceName();
+
+if(aService != "com.sun.star.chart2.LinearRegressionCurve" &&
+aService !=
"com.sun.star.chart2.ExponentialRegressionCurve" &&
+aService !=
"com.sun.star.chart2.LogarithmicRegressionCurve" &&
+aService != "com.sun.star.chart2.PotentialRegressionCurve"
&&
+aService !=
"com.sun.star.chart2.PolynomialRegressionCurve" &&
+aService !=
"com.sun.star.chart2.MovingAverageRegressionCurve")
+continue;
+
pFS->startElement( FSNS( XML_c, XML_trendline ), FSEND );
OUString aName;
@@ -2814,12 +2829,6 @@ void ChartExport::exportTrendlines( Reference<
chart2::XDataSeries > xSeries )
exportShapeProps( xProperties );
-OUString aService;
-Reference< lang::XServiceName > xServiceName( xProperties,
UNO_QUERY );
-if( !xServiceName.is() )
-continue;
-aService = xServiceName->getServiceName();
-
if( aService == "com.sun.star.chart2.LinearRegressionCurve" )
{
pFS->singleElement( FSNS( XML_c, XML_trendlineType ),
@@ -2871,7 +2880,9 @@ void ChartExport::exportTrendlines( Reference<
chart2::XDataSeries > xSeries )
}
else
{
-continue;
+// should never happen
+// This would produce invalid OOXML files so we check earlier
for the type
+assert(false);
}
double aExtrapolateForward = 0.0;
commit dd0c9e64835b825771d961b7a8f21f4d6c077fc7
Author: Markus Mohrhard
Date: Mon Feb 17 23:19:49 2014 +0100
fix indentation
Change-Id: I36be2de793d3d32433530bf71632cb73a676bb9a
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 337d510..b427868 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1851,36 +1851,36 @@ void ChartExport::exportCandleStickSeries(
{
Reference< chart2::data::XDataSequence > xLabelSeq(
xLabeledSeq->getLabel());
Reference< chart2::data::XDataSequence > xValueSeq(
xLabeledSeq->getValues());
-{
-FSHelperPtr pFS = GetFS();
-pFS->startElement( FSNS( XML_c, XML_ser ),
+{
+FSHelperPtr pFS = GetFS();
+pFS->startElement( FSNS( XML_c, XML_ser ),
FSEND );
-// TODO: idx and order
-// idx attribute should start from 1 and not from
0.
-pFS->singleElement( FSNS( XML_c, XML_idx ),
+// TODO: idx and order
+// idx attribute should start from 1 and not from 0.
+pFS->singleElement( FSNS( XML_c, XML_idx ),
XML_val, I32S(idx+1),
FSEND );
-
math syntax highlighting
Hi I started to work on the math syntax highlighting. Actually, I can identify when we have some problems with parenthesis without close and etc. Now, I would like to change the color or background color to show to the user the problematic character. How can I change the color of the string? Is there some field in the OUString that can I do that? Thank you ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 161 +++-
sc/source/core/data/column3.cxx |2
2 files changed, 142 insertions(+), 21 deletions(-)
New commits:
commit 2f55cee39379a76920f3a4fb14e6c2774093bfcd
Author: Kohei Yoshida
Date: Mon Feb 17 19:45:06 2014 -0500
fdo#74573: Skip removing of cell notes on empty cells if the flag is set.
Change-Id: I0d9cb5b48c5fdf51cf290cd838f5d6d7cb572e8b
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 7da6860..5bc149b 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -736,7 +736,7 @@ public:
if (node.type == sc::element_type_empty)
{
-if (bCopyCellNotes)
+if (bCopyCellNotes && !mrCxt.isSkipAttrForEmptyCells())
{
bool bCloneCaption = (nFlags & IDF_NOCAPTIONS) == 0;
duplicateNotes(nSrcRow1, nDataSize, bCloneCaption );
commit d2a80bcd494039bcb54693a8461d1645e51d1c1b
Author: Kohei Yoshida
Date: Mon Feb 17 16:01:48 2014 -0500
fdo#74573: Test pasting of cell attributes as well.
Change-Id: Ib38ac054b40ac21dd4b6088fafca33566d2fc436
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 67c6e8a..14dffd9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -57,6 +57,8 @@
#include
#include
#include
+#include
+#include
#include "formula/IFunctionDescription.hxx"
@@ -3688,7 +3690,75 @@ void Test::testCopyPasteTranspose()
void Test::testCopyPasteSkipEmpty()
{
+struct Check
+{
+const char* mpStr;
+Color maColor;
+bool mbHasNote;
+};
+
+struct Test
+{
+ScDocument* mpDoc;
+
+Test( ScDocument* pDoc ) : mpDoc(pDoc) {}
+
+bool checkRange( const ScAddress& rPos, const Check* p, const Check*
pEnd )
+{
+ScAddress aPos(rPos);
+OUString aPosStr = aPos.Format(SCA_VALID);
+for (; p != pEnd; ++p, aPos.IncRow())
+{
+if (!mpDoc->GetString(aPos).equalsAscii(p->mpStr))
+{
+cerr << aPosStr << ": incorrect string value: expected='"
<< p->mpStr << "' actual='" << mpDoc->GetString(aPos) << endl;
+return false;
+}
+
+const SvxBrushItem* pBrush =
+dynamic_cast(mpDoc->GetAttr(aPos,
ATTR_BACKGROUND));
+
+if (!pBrush)
+{
+cerr << aPosStr << ": failed to get brush item from the
cell." << endl;
+return false;
+}
+
+if (pBrush->GetColor() != p->maColor)
+{
+Color aExpected = p->maColor;
+Color aActual = pBrush->GetColor();
+cerr << aPosStr << ": incorrect cell background color:
expected=("
+<< static_cast(aExpected.GetRed()) << ","
+<< static_cast(aExpected.GetGreen()) << ","
+<< static_cast(aExpected.GetBlue()) << "),
actual=("
+<< static_cast(aActual.GetRed()) << ","
+<< static_cast(aActual.GetGreen()) << ","
+<< static_cast(aActual.GetBlue()) << ")" << endl;
+
+return false;
+}
+
+bool bHasNote = mpDoc->HasNote(aPos);
+if (bHasNote != p->mbHasNote)
+{
+cerr << aPosStr << ": ";
+if (p->mbHasNote)
+cerr << "this cell should have a cell note, but
doesn't." << endl;
+else
+cerr << "this cell should NOT have a cell note, but
one is found." << endl;
+
+return false;
+}
+}
+
+return true;
+}
+
+} aTest(m_pDoc);
+
m_pDoc->InsertTab(0, "Test");
+m_pDoc->InitDrawLayer(&getDocShell()); // for cell note objects.
ScRange aSrcRange(0,0,0,0,4,0);
ScRange aDestRange(1,0,0,1,4,0);
@@ -3696,13 +3766,25 @@ void Test::testCopyPasteSkipEmpty()
ScMarkData aMark;
aMark.SetMarkArea(aDestRange);
-// Put some texts in A1:A5.
+// Put some texts in B1:B5.
m_pDoc->SetString(ScAddress(1,0,0), "A");
m_pDoc->SetString(ScAddress(1,1,0), "B");
m_pDoc->SetString(ScAddress(1,2,0), "C");
m_pDoc->SetString(ScAddress(1,3,0), "D");
m_pDoc->SetString(ScAddress(1,4,0), "E");
+// Set the background color of B1:B5 to blue.
+ScPatternAttr aCellBackColor(m_pDoc->GetPool());
+aCellBackColor.GetItemSet().Put(SvxBrushItem(COL_BLUE, ATTR_BACKGROUND));
+m_pDoc->ApplyPatternAreaTab(1, 0, 1, 4, 0, aCellBackColor);
+
+// Insert notes to B1:B5.
+m_pDoc->GetOrCreateNote(ScAddress(1,0,0));
+m_pDoc->GetOrCreateNote(ScAddress(1,1,0));
+m_pDoc->GetOrCreateNote(ScAddress(1,2,0));
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-1' - 2 commits - sc/source
sc/source/core/tool/token.cxx |3 +++
sc/source/ui/app/inputhdl.cxx |8 +++-
sc/source/ui/inc/inputhdl.hxx |3 +++
sc/source/ui/view/tabvwsh4.cxx |3 +++
4 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 3cc0ed80291b521375d00c1e0a15aa66e712ced6
Author: Kohei Yoshida
Date: Fri Feb 14 12:28:03 2014 -0500
fdo#73773: Check if the *document* is closing, not the *app*.
Otherwise it would crash if the app has multiple document instances open
and only one of them is being closed.
Change-Id: Ib6e370037ab6097c9c6eff8035249663944b3a6c
(cherry picked from commit 76bdf523981d2bd983dac4e01bc5cc934118a73f)
Reviewed-on: https://gerrit.libreoffice.org/8054
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Meeks
Tested-by: Jacobo Aragunde Pérez
Reviewed-by: Jacobo Aragunde Pérez
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 0c6bbc5..d964312 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -299,6 +299,11 @@ handle_r1c1:
}
}
+void ScInputHandler::SetDocumentDisposing( bool b )
+{
+mbDocumentDisposing = b;
+}
+
static void lcl_Replace( EditView* pView, const OUString& rNewStr, const
ESelection& rOldSel )
{
if ( pView )
@@ -519,6 +524,7 @@ ScInputHandler::ScInputHandler()
bProtected( false ),
bCellHasPercentFormat( false ),
bLastIsSymbol( false ),
+mbDocumentDisposing(false),
nValidation( 0 ),
eAttrAdjust( SVX_HOR_JUSTIFY_STANDARD ),
aScaleX( 1,1 ),
@@ -542,7 +548,7 @@ ScInputHandler::~ScInputHandler()
// Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach
SfxApplication::Main
// gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen
-if ( !SFX_APP()->IsDowning() ) // inplace
+if (!mbDocumentDisposing) // inplace
EnterHandler(); // Eingabe noch abschliessen
if (SC_MOD()->GetRefInputHdl()==this)
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 1c2d9c3..528d5c1 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -100,6 +100,7 @@ private:
boolbProtected:1;
boolbCellHasPercentFormat:1;
boolbLastIsSymbol:1;
+boolmbDocumentDisposing:1;
sal_uLong nValidation;
SvxCellHorJustify eAttrAdjust;
@@ -256,6 +257,8 @@ public:
// actually private, public for SID_INPUT_SUM
voidInitRangeFinder(const OUString& rFormula);
+void SetDocumentDisposing( bool b );
+
static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; }
};
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 1c73dbe..ec192da 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1739,6 +1739,9 @@ ScTabViewShell::~ScTabViewShell()
// alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird
//! (soll eigentlich nicht !??!?!)
+if (pInputHandler)
+pInputHandler->SetDocumentDisposing(true);
+
DELETEZ(pFontworkBarShell);
DELETEZ(pExtrusionBarShell);
DELETEZ(pCellShell);
commit 30363f94b94b183f4e9b0f6d9699e76f398154dc
Author: Kohei Yoshida
Date: Fri Feb 14 20:39:18 2014 -0500
fdo#72691: Allow overwriting of string value with numeric one.
This can legitimately happen when you have a matrix with a reference to
another cell inside, and the referenced cell originally contained a
string value then later overwritten by a numeric value.
Example. Put a "Text" in A1, and in B1 put a 1x1 matrix {=A1}. It
displays "Text" in B1. Then put 11 in A1. Prior to this change, B1
would become blank. With this change, B1 will display 11.
Change-Id: I3feba3a8658e1a5ebf6f9e5ac34de2d579464ddb
(cherry picked from commit 9bf907a8278cecd816368db7b8c4ab745a914a59)
Reviewed-on: https://gerrit.libreoffice.org/8065
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Meeks
Reviewed-by: Jacobo Aragunde Pérez
Tested-by: Jacobo Aragunde Pérez
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ff456eb..fc9ad75 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1146,6 +1146,9 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double
f )
case svDouble:
const_cast(xUpperLeft.get())->GetDoubleAsReference() = f;
break;
+case svString:
+xUpperLeft = new FormulaDoubleToken( f);
+break;
case svUnknown:
if (!xUpperLeft)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedeskto
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-1' - 2 commits - sc/inc sc/source
sc/inc/tokenstringcontext.hxx |1 +
sc/source/core/tool/compiler.cxx |1 +
sc/source/core/tool/tokenstringcontext.cxx |6 ++
sc/source/filter/xml/xmlexprt.cxx | 27 +--
sc/source/filter/xml/xmlexprt.hxx |7 +++
5 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit a8a4d42c15f38ed7c8595179263239f9e8b7824f
Author: Kohei Yoshida
Date: Fri Feb 14 11:41:02 2014 -0500
fdo#72390: Let's not skip auto styles from unmodified sheets.
We do re-use sheet XML stream for unmodified sheets on re-save, which
is okay. But skipping auto style population from unmodified sheets
is not okay because autostyles are shared across all sheets and written
outside the sheet XML streams. Skipping styles from unmodified sheets
could potentially fail to export used styles, not to mention could
cause a crash as reported in the bug.
Change-Id: I73e439f7354e341c2c07e28ecca5452193985860
(cherry picked from commit 5000e64ecc55efd47d92714cf6db375ff37aac4b)
(cherry picked from commit 47e540d8323e8ea2db5e7aae455503b32f306ca3)
Reviewed-on: https://gerrit.libreoffice.org/8050
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Meeks
Reviewed-by: Jacobo Aragunde Pérez
Tested-by: Jacobo Aragunde Pérez
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 2bb6769..d5c025d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2533,10 +2533,6 @@ void ScXMLExport::_ExportAutoStyles()
CollectShapesAutoStyles(nTableCount);
for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable,
IncrementProgressBar(false))
{
-bool bUseStream = pSheetData && pDoc &&
pDoc->IsStreamValid((SCTAB)nTable) &&
- pSheetData->HasStreamPos(nTable) &&
xSourceStream.is() &&
- !pDoc->GetChangeTrack();
-
Reference xTable(xIndex->getByIndex(nTable),
uno::UNO_QUERY);
if (!xTable.is())
continue;
@@ -2555,9 +2551,6 @@ void ScXMLExport::_ExportAutoStyles()
}
}
-if (bUseStream)
-continue;
-
// collect other auto-styles only for non-copied sheets
Reference
xCellFormatRanges ( xTable, uno::UNO_QUERY );
if ( xCellFormatRanges.is() )
commit 8deefff6659fda0e38734c2b3176826276debb5d
Author: Kohei Yoshida
Date: Sat Feb 15 10:12:52 2014 -0500
fdo#74512: Fix the ODS export as well.
Change-Id: I54a2b2f405f9172d2ec5646346ef4e8a7ae27cb2
(cherry picked from commit 9a5ce676ede4828db0acde5db79d91320575ec08)
Reviewed-on: https://gerrit.libreoffice.org/8075
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Meeks
Reviewed-by: Jacobo Aragunde Pérez
Tested-by: Jacobo Aragunde Pérez
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index 3740f60..aa61ada 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -56,6 +56,7 @@ class CompileFormulaContext
public:
CompileFormulaContext( ScDocument* pDoc );
+CompileFormulaContext( ScDocument* pDoc, formula::FormulaGrammar::Grammar
eGram );
formula::FormulaGrammar::Grammar getGrammar() const;
void setGrammar( formula::FormulaGrammar::Grammar eGram );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 13b3a85..22a5035 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1628,6 +1628,7 @@ void ScCompiler::CheckTabQuotes( OUString& rString,
case FormulaGrammar::CONV_XL_A1 :
case FormulaGrammar::CONV_XL_R1C1 :
case FormulaGrammar::CONV_XL_OOX :
+case FormulaGrammar::CONV_ODF :
if( bNeedsQuote )
{
const OUString one_quote('\'');
diff --git a/sc/source/core/tool/tokenstringcontext.cxx
b/sc/source/core/tool/tokenstringcontext.cxx
index 203d36a..7586a31 100644
--- a/sc/source/core/tool/tokenstringcontext.cxx
+++ b/sc/source/core/tool/tokenstringcontext.cxx
@@ -114,6 +114,12 @@ CompileFormulaContext::CompileFormulaContext( ScDocument*
pDoc ) :
updateTabNames();
}
+CompileFormulaContext::CompileFormulaContext( ScDocument* pDoc,
formula::FormulaGrammar::Grammar eGram ) :
+mpDoc(pDoc), meGram(eGram)
+{
+updateTabNames();
+}
+
void CompileFormulaContext::updateTabNames()
{
// Fetch all sheet names.
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 42c90fa..2bb6769 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -63,6 +63,7 @@
#include
#include
#include
+#include
#include
#include
@@ -3182,21 +3183,26 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32
nEqualCellCount)
{
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - boost/boost-os2.patch boost/makefile.mk framework/source sd/source svtools/source svx/source sw/inc sw/source ucb/source
boost/boost-os2.patch | 22 ++ boost/makefile.mk |3 framework/source/layoutmanager/layoutmanager.cxx |3 sd/source/ui/func/fuinsert.cxx |8 ++ svtools/source/misc/langtab.src|2 svx/source/svdraw/svdedtv.cxx | 21 ++ sw/inc/docsh.hxx |6 - sw/inc/swwait.hxx | 19 - sw/source/core/doc/docdesc.cxx |2 sw/source/core/edit/autofmt.cxx|2 sw/source/core/edit/edtab.cxx |4 - sw/source/core/frmedt/fetab.cxx|4 - sw/source/core/layout/layact.cxx |2 sw/source/core/view/viewsh.cxx | 26 +++ sw/source/ui/app/appenv.cxx|2 sw/source/ui/app/applab.cxx|2 sw/source/ui/app/docsh.cxx |8 +- sw/source/ui/app/docsh2.cxx| 24 ++- sw/source/ui/app/docshini.cxx |4 - sw/source/ui/app/swwait.cxx| 69 + sw/source/ui/dbui/dbinsdlg.cxx |4 - sw/source/ui/dbui/dbmgr.cxx|2 sw/source/ui/dialog/docstdlg.cxx |2 sw/source/ui/dochdl/swdtflvr.cxx | 11 +-- sw/source/ui/envelp/envlop1.cxx|2 sw/source/ui/index/toxmgr.cxx |2 sw/source/ui/lingu/hyp.cxx |2 sw/source/ui/misc/glossary.cxx |4 - sw/source/ui/misc/redlndlg.cxx | 10 +-- sw/source/ui/misc/srtdlg.cxx |2 sw/source/ui/shells/annotsh.cxx|2 sw/source/ui/shells/basesh.cxx |4 - sw/source/ui/shells/drawsh.cxx |2 sw/source/ui/shells/drwtxtex.cxx |2 sw/source/ui/shells/frmsh.cxx |2 sw/source/ui/shells/grfsh.cxx |2 sw/source/ui/shells/textsh1.cxx|2 sw/source/ui/uiview/view2.cxx |6 - sw/source/ui/uiview/viewling.cxx |2 sw/source/ui/uiview/viewsrch.cxx | 10 +-- ucb/source/ucp/webdav/SerfCallbacks.hxx|2 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx|2 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfRequestProcessor.hxx |2 ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx |2 49 files changed, 199 insertions(+), 127 deletions(-) New commits: commit 60f06b770338e6c4f9da8e9d9322f969a2742bd0 Author: Yuri Dario Date: Mon Feb 17 18:08:12 2014 + #i123817# restored OS/2 boost patches. diff --git a/boost/boost-os2.patch b/boost/boost-os2.patch new file mode 100644 index 000..2c23a87 --- /dev/null +++ b/boost/boost-os2.patch @@ -0,0 +1,22 @@ +--- misc/boost_1_55_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.0 +0200 misc/build/boost_1_55_0/boost/tr1/detail/config.hpp2013-07-04 12:49:12.0 +0200 +@@ -9,6 +9,7 @@ + #include + + #if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \ ++ && !defined(__OS2__) \ +|| (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800)) +// Disable use of #include_next on Linux as typically we are installed in a +// directory that is searched *after* the std lib include path. +--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.0 +0200 misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp2013-07-04 12:50:44.0 +0200 +@@ -107,7 +107,7 @@ + #endif + + # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC) \ +-&& (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) ++&& (defined(__OS2__) || defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) + // Disable use of #include_next on Linux as typically we are installed in a directory that is searched + // *after* the std lib include path: + #define BOOST_TR1_DISABLE_INCLUDE_NEXT +Binary files misc/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf differ diff --git a/boost/makefile.mk b/boost/makefile.mk index a63ed37..141de16 100644 --- a/boost/makefile.mk +++ b/boost/makefile
[Libreoffice-commits] core.git: vcl/README
vcl/README |6 ++ 1 file changed, 6 insertions(+) New commits: commit f807ece8857457860042501b293f9f065c17fd0b Author: Jan Holesovsky Date: Mon Feb 17 23:40:48 2014 +0100 Clipboard content dumping tool to README. Found it by chance, don't want to lose the link ;-) Change-Id: Ie3a1c253a287a8e3ff6f82e75176e22305a03b39 diff --git a/vcl/README b/vcl/README index e4cc922..c1fc0bf 100644 --- a/vcl/README +++ b/vcl/README @@ -45,6 +45,12 @@ unx/ generic/ + raw X11 support + dtrans/ + + "data transfer" - clipboard handling + + http://stackoverflow.com/questions/3261379/getting-html-source-or-rich-text-from-the-x-clipboard + for tips how to show the current content of the + clipboard + How the platform abstraction works ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/xsltml
external/xsltml/xsltml_2.1.2.patch |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit dfbfd51c0173e61858e2f13d89491bad43bde0f5
Author: Julien Nabet
Date: Mon Feb 17 23:18:19 2014 +0100
Resolves: fdo#50451 Mediawiki formula export + vec use
Unicode Character 'COMBINING RIGHT ARROW ABOVE' wasn't taken into account
Change-Id: I4b5fc5fcfa4efe40fc92935e21af829edadf1dea
diff --git a/external/xsltml/xsltml_2.1.2.patch
b/external/xsltml/xsltml_2.1.2.patch
index 292338b..f02b0c5 100644
--- a/external/xsltml/xsltml_2.1.2.patch
+++ b/external/xsltml/xsltml_2.1.2.patch
@@ -1214,7 +1214,7 @@
\overbrace{
}
-@@ -192,10 +193,46 @@
+@@ -192,10 +193,51 @@
\ddot{
}
@@ -1256,6 +1256,11 @@
+
+ }
+
++
++ \vec{
++
++ }
++
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - extras/source
extras/source/wordbook/technical.dic |1 + 1 file changed, 1 insertion(+) New commits: commit 0c459dd299c0d13afa9839f89bad80ca49261520 Author: Andras Timar Date: Mon Feb 17 21:59:46 2014 +0100 add Collabora to wordbook Change-Id: I2d667a84ff1f1523f37895aacf6f97a0b34b7c03 diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index 383c6689..41890d8 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -36,6 +36,7 @@ Chrome Cisco= Clickstream= Cognos= +Collabora= Connect2OracleSelf= ConsoleOne ConText= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/wordbook/technical.dic |1 + 1 file changed, 1 insertion(+) New commits: commit e27bc2293873a3b8db49761c2f5ae73516e67d20 Author: Andras Timar Date: Mon Feb 17 21:59:46 2014 +0100 add Collabora to wordbook Change-Id: I2d667a84ff1f1523f37895aacf6f97a0b34b7c03 diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index c4509d4..2257cc2 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -37,6 +37,7 @@ Chrome Cisco= Clickstream= Cognos= +Collabora= Connect2OracleSelf= ConsoleOne ConText= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4 -
writerfilter/source/doctok/resources.xmi | 62 -
writerfilter/source/ooxml/model.xml|4 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 -
4 files changed, 6 insertions(+), 68 deletions(-)
New commits:
commit 411b14df53724ab66a34051f2b905fcfeac44645
Author: Miklos Vajna
Date: Mon Feb 17 21:34:02 2014 +0100
writerfilter: sprm:{PFKeepFollow,PFKeep} ->
ooxml:CT_PPrBase_keep{Next,Lines}
Change-Id: I59e48e420a4ec276680a1ba5cfb002f656b3c4a9
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 17d5d49..34601fa 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -994,10 +994,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_PJc: // sprmPJc
handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, m_pImpl ));
break;
-case NS_sprm::LN_PFKeep: // sprmPFKeep
+case NS_ooxml::LN_CT_PPrBase_keepLines:
rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue ? false :
true));
break;
-case NS_sprm::LN_PFKeepFollow: // sprmPFKeepFollow
+case NS_ooxml::LN_CT_PPrBase_keepNext:
rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ?
true : false) );
break;
case NS_sprm::LN_PFPageBreakBefore:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 8f05029..c3ae23b 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -100,68 +100,6 @@
-
-
-
-
-
-
-
- 0x2405
-
-
-
-
-
-
-
-
rtf:sprmPFKeep
-
-
-
-
-
-
-
- paragraph
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0x2406
-
-
-
-
-
-
-
-
rtf:sprmPFKeepFollow
-
-
-
-
-
-
-
- paragraph
-
-
-
-
-
-
-
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 87dc6c9..e833fc9 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22338,8 +22338,8 @@
-
-
+
+
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 61c813c..336bd17 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2270,11 +2270,11 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
{
case RTF_KEEP:
if (m_aStates.top().pCurrentBuffer != &m_aTableBuffer)
-nParam = NS_sprm::LN_PFKeep;
+nParam = NS_ooxml::LN_CT_PPrBase_keepLines;
break;
case RTF_KEEPN:
if (m_aStates.top().pCurrentBuffer != &m_aTableBuffer)
-nParam = NS_sprm::LN_PFKeepFollow;
+nParam = NS_ooxml::LN_CT_PPrBase_keepNext;
break;
case RTF_INTBL:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/html/parcss1.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 3ecdc23d164d8e8632375247604cddf04f1e4df4
Author: Jan Holesovsky
Date: Mon Feb 17 21:00:03 2014 +0100
Let's not parse nonsensical data.
Change-Id: Icf956c3824286e8244cf5809be88568de0d6a068
diff --git a/sw/source/filter/html/parcss1.cxx
b/sw/source/filter/html/parcss1.cxx
index 8489355..692474b 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -1273,11 +1273,11 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
{
sal_uInt8 aColors[3] = { 0, 0, 0 };
-OSL_ENSURE( aValue.startsWithIgnoreAsciiCase( "rgb" ) &&
-aValue.getLength() > 5 &&
-'(' == aValue[3] &&
-')' == aValue[aValue.getLength()-1],
-"keine gueltiges RGB(...)" );
+if (!aValue.startsWithIgnoreAsciiCase( "rgb" ) ||
aValue.getLength() < 6 ||
+aValue[3] != '(' || aValue[aValue.getLength()-1] != ')')
+{
+break;
+}
OUString aColorStr(aValue.copy(4, aValue.getLength() - 5));
commit 2afb605601ec0b29e177dd38e4f16bfe06590882
Author: Jan Holesovsky
Date: Mon Feb 17 20:49:24 2014 +0100
Fix crash in css rgb color handling.
Crashing since 2000 (or earlier).
Change-Id: I9f91d56f380be2421370b0acbee351461e1f0973
diff --git a/sw/source/filter/html/parcss1.cxx
b/sw/source/filter/html/parcss1.cxx
index 3dfbaea..8489355 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -1279,7 +1279,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
')' == aValue[aValue.getLength()-1],
"keine gueltiges RGB(...)" );
-OUString aColorStr( aValue.copy( 4, aValue.getLength()-1 ) );
+OUString aColorStr(aValue.copy(4, aValue.getLength() - 5));
sal_Int32 nPos = 0;
sal_uInt16 nCol = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source sfx2/uiconfig
sfx2/source/dialog/mgetempl.cxx |5 +
sfx2/uiconfig/ui/managestylepage.ui | 10 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit bf2d7f598be36fc3804392403c7d09405f94cff8
Author: Caolán McNamara
Date: Mon Feb 17 12:44:14 2014 +
Resolves: fdo#72233 too long style names over-stretch dialog
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49
(cherry picked from commit a95888e6e62a702f4b9af4a68c44339b51dc283e)
Reviewed-on: https://gerrit.libreoffice.org/8085
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 0d6755d..932fddd 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window*
pParent, const SfxItemS
{
get(m_pNameRo, "namero");
get(m_pNameRw, "namerw");
+m_pNameRo->set_width_request(m_pNameRw->get_preferred_size().Width());
get(m_pAutoCB, "autoupdate");
get(m_pFollowFt, "nextstyleft");
get(m_pFollowLb, "nextstyle");
m_pFollowLb->SetStyle(m_pFollowLb->GetStyle() | WB_SORT);
+const sal_Int32 nMaxWidth(62);
+m_pFollowLb->setMaxWidthChars(nMaxWidth);
get(m_pBaseFt, "linkedwithft");
get(m_pBaseLb, "linkedwith");
m_pBaseLb->SetStyle(m_pBaseLb->GetStyle() | WB_SORT);
+m_pBaseLb->setMaxWidthChars(nMaxWidth);
get(m_pFilterFt, "categoryft");
get(m_pFilterLb, "category");
m_pFilterLb->SetStyle(m_pFilterLb->GetStyle() | WB_SORT);
+m_pFilterLb->setMaxWidthChars(nMaxWidth);
get(m_pDescFt, "desc");
// this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui
b/sfx2/uiconfig/ui/managestylepage.ui
index 551f2d3..9bd0671 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
+
-
+
True
False
@@ -100,8 +101,6 @@
False
center
True
-0
-1
1
@@ -116,8 +115,6 @@
False
center
True
-0
-1
1
@@ -132,8 +129,6 @@
False
center
True
-0
-1
1
@@ -187,6 +182,7 @@
center
True
â
+52
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source sfx2/uiconfig
sfx2/source/dialog/mgetempl.cxx |5 +
sfx2/uiconfig/ui/managestylepage.ui | 10 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 90d15dae42abf0a2c640a14e98148f5c54adccc3
Author: Caolán McNamara
Date: Mon Feb 17 12:44:14 2014 +
Resolves: fdo#72233 too long style names over-stretch dialog
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49
Reviewed-on: https://gerrit.libreoffice.org/8084
Tested-by: Kohei Yoshida
Reviewed-by: Kohei Yoshida
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5462100..cedbdc1 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window*
pParent, const SfxItemS
{
get(m_pNameRo, "namero");
get(m_pNameRw, "namerw");
+m_pNameRo->set_width_request(m_pNameRw->get_preferred_size().Width());
get(m_pAutoCB, "autoupdate");
get(m_pFollowFt, "nextstyleft");
get(m_pFollowLb, "nextstyle");
m_pFollowLb->SetStyle(m_pFollowLb->GetStyle() | WB_SORT);
+const sal_Int32 nMaxWidth(62);
+m_pFollowLb->setMaxWidthChars(nMaxWidth);
get(m_pBaseFt, "linkedwithft");
get(m_pBaseLb, "linkedwith");
m_pBaseLb->SetStyle(m_pBaseLb->GetStyle() | WB_SORT);
+m_pBaseLb->setMaxWidthChars(nMaxWidth);
get(m_pFilterFt, "categoryft");
get(m_pFilterLb, "category");
m_pFilterLb->SetStyle(m_pFilterLb->GetStyle() | WB_SORT);
+m_pFilterLb->setMaxWidthChars(nMaxWidth);
get(m_pDescFt, "desc");
// this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui
b/sfx2/uiconfig/ui/managestylepage.ui
index 551f2d3..9bd0671 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
+
-
+
True
False
@@ -100,8 +101,6 @@
False
center
True
-0
-1
1
@@ -116,8 +115,6 @@
False
center
True
-0
-1
1
@@ -132,8 +129,6 @@
False
center
True
-0
-1
1
@@ -187,6 +182,7 @@
center
True
â
+52
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-1' - cui/uiconfig
cui/uiconfig/ui/possizetabpage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 5d767fe36660384167697c697cbc94c58cf42f1a Author: Tomaž Vajngerl Date: Sat Feb 15 15:29:02 2014 +0100 fdo#72967 Draw position size tab - min size is 0 not 1 (mm) Adjustment for size of an object had the minimum set to 1 (mm) instead of 0. Change-Id: I7d4c0998d2987448cea0fd7934649c02a513ac06 Reviewed-on: https://gerrit.libreoffice.org/8073 Reviewed-by: Andras Timar Tested-by: Andras Timar Reviewed-by: Kohei Yoshida diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index 65d83ef..25c48cb 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -500,7 +500,6 @@ 10 -1 100 1 10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 10 ++--
writerfilter/source/doctok/resources.xmi | 62 ---
writerfilter/source/ooxml/model.xml |4 -
3 files changed, 7 insertions(+), 69 deletions(-)
New commits:
commit 7a984575988b0de3e7f73a621d2079dabad39b59
Author: Miklos Vajna
Date: Mon Feb 17 18:20:16 2014 +0100
writerfilter: sprm:PBrc{Between,Bar} -> ooxml:CT_PBdr_{between,bar}
Change-Id: I9ed3f3beafc8b3dd340b39ed24c5eb8315c19a2f
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 904cd40..17d5d49 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1103,7 +1103,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_PBdr_left:
case NS_ooxml::LN_CT_PBdr_bottom:
case NS_ooxml::LN_CT_PBdr_right:
-case NS_sprm::LN_PBrcBetween: // sprmPBrcBetween
+case NS_ooxml::LN_CT_PBdr_between:
{
//in binary format the borders are directly provided in OOXML they
are inside of properties
if( IsOOXMLImport() || IsRTFImport() )
@@ -1133,7 +1133,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
eBorderId = PROP_RIGHT_BORDER;
eBorderDistId = PROP_RIGHT_BORDER_DISTANCE ;
break;
-case NS_sprm::LN_PBrcBetween:
+case NS_ooxml::LN_CT_PBdr_between:
//not supported
break;
default:;
@@ -1157,7 +1157,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
PropertyIds eBorderDistId = PROP_LEFT_BORDER_DISTANCE ;
switch( nSprmId )
{
-case NS_sprm::LN_PBrcBetween: // sprmPBrcBetween
+case NS_ooxml::LN_CT_PBdr_between:
OSL_FAIL( "TODO: inner border is not handled");
break;
case NS_ooxml::LN_CT_PBdr_left:
@@ -1182,8 +1182,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
}
}
break;
-case NS_sprm::LN_PBrcBar:
-break; // sprmPBrcBar
+case NS_ooxml::LN_CT_PBdr_bar:
+break;
case NS_sprm::LN_PFNoAutoHyph: // sprmPFNoAutoHyph
rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue ?
false : true ));
break;
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 8fa5eec..8f05029 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -379,45 +379,6 @@
-
-
-
-
-
-
-
- 0x6629
-
-
-
-
-
-
-
-
rtf:sprmPBrcBar
-
-
-
-
-
-
-
- paragraph
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1968,29 +1929,6 @@
-
-
-
-
-
-
-
- 0x6428
-
-
-
-
-
-
-
-
rtf:sprmPBrcBetween
-
-
-
-
-
-
-
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index ab0476a..87dc6c9 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22318,8 +22318,8 @@
-
-
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 64 ++
sc/source/ui/undo/undoblk.cxx |5 ++-
2 files changed, 57 insertions(+), 12 deletions(-)
New commits:
commit 9e49b6abe7cedd2ac7137170f76ec5d7e14bd295
Author: Kohei Yoshida
Date: Mon Feb 17 12:20:57 2014 -0500
fdo#75032: Skip notes when copying values from undo document.
Notes undo redo are handled separately by the drawing layer.
Change-Id: Iae37ac86889d7a25f25e6dd0b69f724107c6798a
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 2b30fed..694e171 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -414,8 +414,11 @@ void ScUndoDeleteCells::DoChange( const sal_Bool bUndo )
// if Undo, restore references
for( i=0; iCopyToDocument( aEffRange.aStart.Col(),
aEffRange.aStart.Row(), pTabs[i], aEffRange.aEnd.Col(), aEffRange.aEnd.Row(),
pTabs[i]+pScenarios[i],
-IDF_ALL | IDF_NOCAPTIONS, false, pDoc );
+nFlags, false, pDoc );
}
ScRange aWorkRange( aEffRange );
commit 6a5df6427913af1df99e770ea68daaa02e7c
Author: Kohei Yoshida
Date: Mon Feb 17 11:38:35 2014 -0500
fdo#75032: Add a test case to reproduce the crash.
Change-Id: I1bb980e9872515a8684014a0e0be9fd4c717f9fd
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index a8ec5e2..67c6e8a 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4885,30 +4885,72 @@ void Test::testNoteBasic()
void Test::testNoteDeleteRow()
{
-ScDocument* pDoc = getDocShell().GetDocument();
OUString aSheet1("Sheet1");
-pDoc->InsertTab(0, aSheet1);
+m_pDoc->InsertTab(0, aSheet1);
+
+// We need a drawing layer in order to create caption objects.
+m_pDoc->InitDrawLayer(&getDocShell());
OUString aHello("Hello");
OUString aJimBob("Jim Bob");
-ScAddress rAddr(1, 1, 0);
-ScPostIt* pNote = m_pDoc->GetOrCreateNote(rAddr);
-pNote->SetText(rAddr, aHello);
+ScAddress aPos(1, 1, 0);
+ScPostIt* pNote = m_pDoc->GetOrCreateNote(aPos);
+pNote->SetText(aPos, aHello);
pNote->SetAuthor(aJimBob);
-CPPUNIT_ASSERT_MESSAGE("there should be a note", pDoc->HasNote(1, 1, 0));
+CPPUNIT_ASSERT_MESSAGE("there should be a note", m_pDoc->HasNote(1, 1, 0));
// test with IsBlockEmpty
bool bIgnoreNotes = true;
-CPPUNIT_ASSERT_MESSAGE("The Block should be detected as empty (no Notes)",
pDoc->IsBlockEmpty(0, 0, 0, 100, 100, bIgnoreNotes));
+CPPUNIT_ASSERT_MESSAGE("The Block should be detected as empty (no Notes)",
m_pDoc->IsBlockEmpty(0, 0, 0, 100, 100, bIgnoreNotes));
bIgnoreNotes = false;
-CPPUNIT_ASSERT_MESSAGE("The Block should NOT be detected as empty",
!pDoc->IsBlockEmpty(0, 0, 0, 100, 100, bIgnoreNotes));
+CPPUNIT_ASSERT_MESSAGE("The Block should NOT be detected as empty",
!m_pDoc->IsBlockEmpty(0, 0, 0, 100, 100, bIgnoreNotes));
-pDoc->DeleteRow(0, 0, MAXCOL, 0, 1, 1);
+m_pDoc->DeleteRow(0, 0, MAXCOL, 0, 1, 1);
-CPPUNIT_ASSERT_MESSAGE("there should be no more note", !pDoc->HasNote(1,
1, 0));
+CPPUNIT_ASSERT_MESSAGE("there should be no more note", !m_pDoc->HasNote(1,
1, 0));
-pDoc->DeleteTab(0);
+// Set values and notes into B3:B4.
+aPos = ScAddress(1,2,0); // B3
+m_pDoc->SetString(aPos, "First");
+ScNoteUtil::CreateNoteFromString(*m_pDoc, aPos, "First Note", false,
false);
+
+aPos = ScAddress(1,3,0); // B4
+m_pDoc->SetString(aPos, "Second");
+ScNoteUtil::CreateNoteFromString(*m_pDoc, aPos, "Second Note", false,
false);
+
+ScDocFunc& rDocFunc = getDocShell().GetDocFunc();
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+rDocFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true,
true);
+
+// Check to make sure the notes have shifted upward.
+pNote = m_pDoc->GetNote(ScAddress(1,1,0));
+CPPUNIT_ASSERT_MESSAGE("B2 should have a note.", pNote);
+CPPUNIT_ASSERT_EQUAL(OUString("First Note"), pNote->GetText());
+pNote = m_pDoc->GetNote(ScAddress(1,2,0));
+CPPUNIT_ASSERT_MESSAGE("B3 should have a note.", pNote);
+CPPUNIT_ASSERT_EQUAL(OUString("Second Note"), pNote->GetText());
+pNote = m_pDoc->GetNote(ScAddress(1,3,0));
+CPPUNIT_ASSERT_MESSAGE("B4 should NOT have a note.", !pNote);
+
+// Undo.
+
+SfxUndoManager* pUndoMgr = m_pDoc->GetUndoManager();
+CPPUNIT_ASSERT_MESSAGE("Failed to get undo manager.", pUndoMgr);
+m_pDoc->CreateAllNoteCaptions(); // to make sure that all notes have their
corresponding caption objects...
+
+pUndoMgr->Undo();
+pNote = m_pDoc->GetNote(ScAddress(1,1,0));
+CPPUNIT_ASSERT_MESSAGE("B2 should NOT have a note.", !pNote);
+pNote = m_pDoc->GetNote(ScAddress(1,2,0));
+CPPUNIT_ASSERT_MESSAGE("B3 should have a note.", pNote);
+CPPUNIT_ASSERT_EQUAL(OUString("First Note"), pNote->GetText());
+pNote = m_pDoc->GetNote(ScAddress(1,3,0));
+CPPUNIT_ASSERT_MESSAGE("B4 should h
[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf |7 +++
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 08fb25ab7941c52d4eed0435a45a38b03aff588c
Author: Miklos Vajna
Date: Mon Feb 17 17:50:57 2014 +0100
abi#3623 RTF import: missing null pointer check
Change-Id: I5861e5fec0d822f42dfeb994500a818a968e69fb
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
new file mode 100644
index 000..a47161a
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
@@ -0,0 +1,7 @@
+{\rtf1
+{\stylesheet
+{\s2\ls1\sbasedon0 heading 2;}
+}
+\s2
+foo\par
+}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index b3932c3..904cd40 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2015,7 +2015,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
{
const StyleSheetEntryPtr pParent =
pStyleTable->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
const StyleSheetPropertyMap* pParentProperties =
dynamic_cast(pParent ? pParent->pProperties.get()
: 0);
-if (pParentProperties->find(PROP_PARA_RIGHT_MARGIN) !=
pParentProperties->end())
+if (pParentProperties &&
pParentProperties->find(PROP_PARA_RIGHT_MARGIN) != pParentProperties->end())
nParaRightMargin =
pParentProperties->find(PROP_PARA_RIGHT_MARGIN)->second.getValue().get();
}
if (nParaRightMargin != 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 685ec1899435037205d98a102a32ca8b6a4836d0
Author: Caolán McNamara
Date: Mon Feb 17 16:57:44 2014 +
Related: fdo#74284 try AccessibleRole::PANEL for VclBoxes under windows
Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 4cfdc80..344e4b5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -322,7 +322,13 @@ bool VclBox::set_property(const OString &rKey, const
OString &rValue)
sal_uInt16 VclBox::getDefaultAccessibleRole() const
{
+#if defined(WNT)
+//fdo#74284 call Boxes Panels, keep then as "Filler" under
+//at least Linux seeing as that's what Gtk does for GtkBoxes
+return com::sun::star::accessibility::AccessibleRole::PANEL;
+#else
return com::sun::star::accessibility::AccessibleRole::FILLER;
+#endif
}
#define DEFAULT_CHILD_MIN_WIDTH 85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/module-deps.pl Makefile.in
Makefile.in|3 ++
bin/module-deps.pl | 59 +++--
2 files changed, 56 insertions(+), 6 deletions(-)
New commits:
commit a19440bee79f9458b3ddc072a02d848c77c52264
Author: Stephan Bergmann
Date: Mon Feb 17 18:03:44 2014 +0100
Add toposort feature to module-deps.pl
Change-Id: Id839eae62ad53189c44f7ca5a498bf7113c2536a
diff --git a/Makefile.in b/Makefile.in
index 503f74a..a7a0965 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -328,6 +328,9 @@ dump-deps:
dump-deps-png:
@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild |
dot -Tpng -o lo.png
+dump-deps-sort:
+ @$(SRCDIR)/bin/module-deps.pl -t $(GNUMAKE) $(SRCDIR)/Makefile.gbuild
+
define gb_Top_GbuildToIdeIntegration
$(1)-ide-integration:
cd $(SRCDIR) && (LC_MESSAGES=C $(GNUMAKE) cmd="$(GNUMAKE) -npf
Makefile.gbuild all" cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index e77db25..0520eca 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -12,8 +12,9 @@ my $verbose = 0;
my $no_leaf;
my $from_file;
my $to_file;
-my $graph_file;
+my $output_file;
my $preserve_libs = 0;
+my $toposort = 0;
sub logit($)
{
@@ -283,7 +284,7 @@ sub dump_graphviz($)
{
my $tree = shift;
my $to = \*STDOUT;
-open($to, ">$graph_file") if defined($graph_file);
+open($to, ">$output_file") if defined($output_file);
print $to <{$name}) && $tags->{$name} == 1);
+if (!$tags->{$name}) {
+$tags->{$name} = 1;
+my $result = $tree->{$name};
+for my $dep (@{$result->{deps}}) {
+toposort_visit($tree, $list, $tags, $dep);
+}
+$tags->{$name} = 2;
+push @{$list}, $name;
+}
+}
+
+sub dump_toposort($)
+{
+my $tree = shift;
+my @list;
+my %tags;
+for my $name (sort keys %{$tree}) {
+toposort_visit($tree, \@list, \%tags, $name);
+}
+my $to = \*STDOUT;
+open($to, ">$output_file") if defined($output_file);
+for (my $i = 0; $i <= $#list; ++$i) {
+print $to "$list[$i]\n";
+}
+}
+
sub filter_targets($)
{
my $tree = shift;
@@ -326,10 +362,11 @@ sub parse_options()
VersionMessage(-msg => "You are using: 1.0 of ");
},
'preserve-libs|p' => \$preserve_libs,
+'toposort|t' => \$toposort,
'write-dep-file|w=s' => \$to_file,
'read-dep-file|f=s' => \$from_file,
'no-leaf|l' => \$no_leaf,
-'graph-file|o=s' => \$graph_file);
+'output-file|o=s' => \$output_file);
GetOptions(%h) or pod2usage(2);
pod2usage(1) if $help;
pod2usage(-exitstatus => 0, -verbose => 2) if $man;
@@ -352,7 +389,11 @@ sub main()
if ($no_leaf) {
$tree = prune_leaves($tree);
}
-dump_graphviz($tree);
+if ($toposort) {
+dump_toposort($tree);
+} else {
+dump_graphviz($tree);
+}
}
main()
@@ -395,6 +436,12 @@ Prints the version and exits.
Don't collapse libs to modules
+=item B<--toposort>
+
+=item B<-t>
+
+Output a topological sorting instead of a graph
+
=item B<--read-dep-file file>
=item B<-f>
@@ -407,11 +454,11 @@ Read dependency from file.
Write dependency to file.
-=item B<--graph-file file>
+=item B<--output-file file>
=item B<-o>
-Write output to graph file
+Write graph or sort output to file
=back
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/msgpool.cxx | 25 +
1 file changed, 17 insertions(+), 8 deletions(-)
New commits:
commit be0177fe422f283e4ab87acd4d6d092366b25bc3
Author: Matúš Kukan
Date: Mon Feb 17 16:48:44 2014 +0100
Do not crash when no interfaces are registered.
Change-Id: Idee3bb5821e8b46da78243f6396780b35f23e30a
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index ecd69c7..ed62cb6 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -111,7 +111,10 @@ TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
void SfxSlotPool::ReleaseInterface( SfxInterface& rInterface )
{
-DBG_ASSERT( _pInterfaces, "releasing SfxInterface, but there are none" );
+SAL_WARN_IF(!_pInterfaces, "sfx.control", "releasing SfxInterface, but
there are none");
+if (!_pInterfaces)
+return ;
+
// remove from the list of SfxInterface instances
SfxInterfaceArr_Impl::iterator i = std::find(_pInterfaces->begin(),
_pInterfaces->end(), &rInterface);
if(i != _pInterfaces->end())
@@ -122,7 +125,9 @@ void SfxSlotPool::ReleaseInterface( SfxInterface&
rInterface )
const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
{
-DBG_ASSERT( _pInterfaces != NULL, "no Interfaces registered" );
+SAL_WARN_IF(!_pInterfaces, "sfx.control", "no Interfaces registered");
+if (!_pInterfaces)
+return 0;
// First, search their own interfaces
for ( sal_uInt16 nInterf = 0; nInterf < _pInterfaces->size(); ++nInterf )
@@ -142,7 +147,7 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo )
{
-DBG_ASSERT( _pInterfaces != NULL, "no Interfaces registered" );
+SAL_WARN_IF(!_pInterfaces, "sfx.control", "no Interfaces registered");
// if the group exists, use it
if ( _pGroups && nNo < _pGroups->size() )
@@ -195,7 +200,9 @@ sal_uInt16 SfxSlotPool::GetGroupCount()
const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
{
-DBG_ASSERT( _pInterfaces != NULL, "no Interfaces registered" );
+SAL_WARN_IF(!_pInterfaces, "sfx.control", "no Interfaces registered");
+if (!_pInterfaces)
+return 0;
// The numbering starts at the interfaces of the parent pool
sal_uInt16 nFirstInterface = _pParentPool ?
_pParentPool->_pInterfaces->size() : 0;
@@ -208,7 +215,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16
nStartInterface )
// Is the Interface still in the Parent-Pool?
if ( nStartInterface < nFirstInterface )
{
-DBG_ASSERT( _pParentPool, "No parent pool!" );
+SAL_WARN_IF(!_pParentPool, "sfx.control", "No parent pool!");
_nCurInterface = nStartInterface;
return _pParentPool->SeekSlot( nStartInterface );
}
@@ -238,7 +245,9 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16
nStartInterface )
const SfxSlot* SfxSlotPool::NextSlot()
{
-DBG_ASSERT( _pInterfaces != NULL, "no Interfaces registered" );
+SAL_WARN_IF(!_pInterfaces, "sfx.control", "no Interfaces registered");
+if (!_pInterfaces)
+return 0;
// The numbering starts at the interfaces of the parent pool
sal_uInt16 nFirstInterface = _pParentPool ?
_pParentPool->_pInterfaces->size() : 0;
@@ -248,7 +257,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
if ( _nCurInterface < nFirstInterface )
{
-DBG_ASSERT( _pParentPool, "No parent pool!" );
+SAL_WARN_IF(!_pParentPool, "sfx.control", "No parent pool!");
const SfxSlot *pSlot = _pParentPool->NextSlot();
_nCurInterface = _pParentPool->_nCurInterface;
if ( pSlot )
@@ -294,7 +303,7 @@ SfxInterface* SfxSlotPool::FirstInterface()
const SfxSlot* SfxSlotPool::GetUnoSlot( const OUString& rName )
{
const SfxSlot *pSlot = NULL;
-for ( sal_uInt16 nInterface=0; nInterface<_pInterfaces->size();
++nInterface )
+for (sal_uInt16 nInterface = 0; _pInterfaces && nInterface <
_pInterfaces->size(); ++nInterface)
{
pSlot = (*_pInterfaces)[nInterface]->GetSlot( rName );
if ( pSlot )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/floating-table-position.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
writerfilter/source/dmapper/TablePositionHandler.cxx |4 ++--
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit f4ae06c6b558628457f3abdade1f2a705bf8b886
Author: Zolnai Tamás
Date: Mon Feb 17 14:43:15 2014 +0100
DOCX import: fix position of floating tables
Change-Id: I542acfd3215dcc7bbc2de49c567f73de0cda97a7
diff --git a/sw/qa/extras/ooxmlexport/data/floating-table-position.docx
b/sw/qa/extras/ooxmlexport/data/floating-table-position.docx
new file mode 100644
index 000..de7a467
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/floating-table-position.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9514031..a7ea175 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3276,6 +3276,18 @@ DECLARE_OOXMLEXPORT_TEST(testNestedTextFrames,
"nested-text-frames.odt")
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:txbx/w:txbxContent/w:p/w:r/w:t",
3);
}
+DECLARE_OOXMLEXPORT_TEST(testFloatingTablePosition,
"floating-table-position.docx")
+{
+// Position of text frame was wrong, because some conversion was missing.
+uno::Reference xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+uno::Reference xFrame(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
+// This was 3295.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5964), getProperty(xFrame,
"HoriOrientPosition"));
+// This was 4611.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8133), getProperty(xFrame,
"VertOrientPosition"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx
b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 4c08bc9..6909f71 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -150,7 +150,7 @@ uno::Sequence
TablePositionHandler::getTablePosition() con
pFrameProperties[13].Name = "HoriOrientRelation";
pFrameProperties[13].Value <<= nHoriOrientRelation;
pFrameProperties[14].Name = "HoriOrientPosition";
-pFrameProperties[14].Value <<= m_nX;
+pFrameProperties[14].Value <<= ConversionHelper::convertTwipToMM100(m_nX);
// Vertical positioning
@@ -177,7 +177,7 @@ uno::Sequence
TablePositionHandler::getTablePosition() con
pFrameProperties[16].Name = "VertOrientRelation";
pFrameProperties[16].Value <<= nVertOrientRelation;
pFrameProperties[17].Name = "VertOrientPosition";
-pFrameProperties[17].Value <<= m_nY;
+pFrameProperties[17].Value <<= ConversionHelper::convertTwipToMM100(m_nY);
return aFrameProperties;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/frmdlg/column.cxx | 24 ++-- 1 file changed, 6 insertions(+), 18 deletions(-) New commits: commit 7d040153e8929f4a5a3362f04cd25e6ddb4d9f2c Author: Caolán McNamara Date: Mon Feb 17 16:16:56 2014 + Resolves: fdo#61704 update on modify, not up/down/lose-focus Change-Id: Ife98beb24d43f0e58f47c654ad8ef9605e5e3ffc diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index c58aa29..82658bb 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -479,30 +479,18 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) // announce Controls for additional region at the MoreButton Link aCLNrLk = LINK(this, SwColumnPage, ColModify); -m_pCLNrEdt->SetLoseFocusHdl(aCLNrLk); -m_pCLNrEdt->SetUpHdl(aCLNrLk); -m_pCLNrEdt->SetDownHdl(aCLNrLk); +m_pCLNrEdt->SetModifyHdl(aCLNrLk); Link aLk = LINK(this, SwColumnPage, GapModify); -aDistEd1.SetUpHdl(aLk); -aDistEd1.SetDownHdl(aLk); -aDistEd1.SetLoseFocusHdl(aLk); -aDistEd2.SetUpHdl(aLk); -aDistEd2.SetDownHdl(aLk); -aDistEd2.SetLoseFocusHdl(aLk); +aDistEd1.SetModifyHdl(aLk); +aDistEd2.SetModifyHdl(aLk); aLk = LINK(this, SwColumnPage, EdModify); -aEd1.SetUpHdl(aLk); -aEd1.SetDownHdl(aLk); -aEd1.SetLoseFocusHdl(aLk); +aEd1.SetModifyHdl(aLk); -aEd2.SetUpHdl(aLk); -aEd2.SetDownHdl(aLk); -aEd2.SetLoseFocusHdl(aLk); +aEd2.SetModifyHdl(aLk); -aEd3.SetUpHdl(aLk); -aEd3.SetDownHdl(aLk); -aEd3.SetLoseFocusHdl(aLk); +aEd3.SetModifyHdl(aLk); m_pBtnBack->SetClickHdl(LINK(this, SwColumnPage, Up)); m_pBtnNext->SetClickHdl(LINK(this, SwColumnPage, Down)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/dml-groupshape-relsize.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/core/layout/anchoreddrawobject.cxx |5 +++--
writerfilter/source/dmapper/GraphicImport.cxx |3 +--
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit f7a7a5a686367aa775fef8d077bfdfec7b2fad82
Author: Miklos Vajna
Date: Mon Feb 17 16:27:39 2014 +0100
SwAnchoredDrawObject::GetObjBoundRect: ignore relative size of group shapes
Instead of not reading the relative size of group shapes at all, read it
into the document model, just ignore it during painting. Visually this
doesn't change anything, however this way we can write the information
back to the file.
Change-Id: Ic24fceaacec0f831d657a35e52493e1c0e9bf626
diff --git a/sw/qa/extras/ooxmlexport/data/dml-groupshape-relsize.docx
b/sw/qa/extras/ooxmlexport/data/dml-groupshape-relsize.docx
new file mode 100755
index 000..6be137b
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/dml-groupshape-relsize.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 86b1d84..9514031 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2308,6 +2308,15 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeRelsize,
"dml-shape-relsize.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH",
"relativeFrom", "page");
}
+DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize,
"dml-groupshape-relsize.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// Relative size wasn't imported.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH",
"relativeFrom", "page");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark,
"testTrackChangesDeletedParagraphMark.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index dd260ec..65416d4 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -27,8 +27,8 @@
// --> #i32795#
#include
// --> #i32795#
-// template class
#include
+#include
using namespace ::com::sun::star;
@@ -626,8 +626,9 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const
// --> #i70122#
const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
{
+bool bGroupShape = PTR_CAST(SdrObjGroup, GetDrawObj());
// Resize objects with relative width or height
-if ( GetPageFrm( ) && ( GetDrawObj( )->GetRelativeWidth( ) ||
GetDrawObj()->GetRelativeHeight( ) ) )
+if ( !bGroupShape && GetPageFrm( ) && ( GetDrawObj( )->GetRelativeWidth( )
|| GetDrawObj()->GetRelativeHeight( ) ) )
{
Rectangle aPageRect = GetPageFrm( )->GetBoundRect( ).SVRect();
Rectangle aCurrObjRect = GetDrawObj()->GetCurrentBoundRect();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index f3d33cf..2009bf5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -955,8 +955,7 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
sal_Int16 nPositivePercentage =
rtl::math::round(m_pImpl->m_rPositivePercentages.front().toDouble() /
oox::drawingml::PER_PERCENT);
m_pImpl->m_rPositivePercentages.pop();
-uno::Reference xServiceInfo(m_xShape,
uno::UNO_QUERY);
-if (nPositivePercentage &&
!xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"))
+if (nPositivePercentage)
{
uno::Reference xPropertySet(m_xShape,
uno::UNO_QUERY);
OUString aProperty = nSprmId ==
NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString("RelativeWidth") :
OUString("RelativeHeight");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - oox/source sc/source
oox/source/export/vmlexport.cxx |5 +
sc/source/filter/excel/xeescher.cxx |5 -
sc/source/filter/excel/xepivot.cxx | 11 ++-
sc/source/filter/inc/xepivot.hxx|3 ++-
4 files changed, 17 insertions(+), 7 deletions(-)
New commits:
commit cd03b4ac54076b5471bf8b3154ecb6b4e7cc
Author: Markus Mohrhard
Date: Mon Feb 17 05:39:07 2014 +0100
fix invalid string access, related #i83611#
Change-Id: I5954f78e10d99a064f83e96282c28c086c7f07f1
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 4a9fb82..67ac325 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -691,7 +691,10 @@ XclExpTbxControlObj::XclExpTbxControlObj(
XclExpObjectManager& rRoot, Reference<
//Export description as alt text
if( SdrObject* pSdrObj = SdrObject::getSdrObjectFromXShape( xShape ) )
{
-OUString aAltTxt = pSdrObj->GetDescription().copy( 0,
MSPROP_DESCRIPTION_MAX_LEN );
+OUString aAltTxt;
+OUString aDescrText = pSdrObj->GetDescription();
+if(!aDescrText.isEmpty())
+aAltTxt = aDescrText.copy( 0,
std::min(MSPROP_DESCRIPTION_MAX_LEN, aDescrText.getLength()) );
aPropOpt.AddOpt( ESCHER_Prop_wzDescription, aAltTxt );
}
commit 8a5c8c251fe42f639b029f72244326cdc1b3bb7b
Author: Markus Mohrhard
Date: Sun Feb 16 22:07:20 2014 +0100
multiple pivot tables on same sheet OOXML fix (part1), related #i83250#
This just fixes the generation of the pivot table file and the
relationship. It crashed in a dbgutil build because we tried to
overwrite the same stream for each pivot table on one sheet.
Change-Id: If2c9541e38b483ead75fff32d5f6d9e16970e702
diff --git a/sc/source/filter/excel/xepivot.cxx
b/sc/source/filter/excel/xepivot.cxx
index e03cbf1..a0a00d6 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1243,13 +1243,14 @@ void XclExpPTField::WriteSxvdex( XclExpStream& rStrm )
const
//
-XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject&
rDPObj, const XclExpPivotCache& rPCache ) :
+XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject&
rDPObj, const XclExpPivotCache& rPCache, size_t nId ) :
XclExpRoot( rRoot ),
mrPCache( rPCache ),
maDataOrientField( *this, EXC_SXIVD_DATA ),
mnOutScTab( 0 ),
mbValid( false ),
-mbFilterBtn( false )
+mbFilterBtn( false ),
+mnId( nId )
{
const ScRange& rOutScRange = rDPObj.GetOutRange();
if( GetAddressConverter().ConvertRange( maPTInfo.maOutXclRange,
rOutScRange, true ) )
@@ -1352,8 +1353,8 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
if( !mbValid )
return;
sax_fastparser::FSHelperPtr aPivotTableDefinition =
rStrm.CreateOutputStream(
-XclXmlUtils::GetStreamName( "xl/", "pivotTables/pivotTable",
mnOutScTab+1),
-XclXmlUtils::GetStreamName( "../", "pivotTables/pivotTable",
mnOutScTab+1),
+XclXmlUtils::GetStreamName( "xl/", "pivotTables/pivotTable", mnId
+ 1),
+XclXmlUtils::GetStreamName( "../", "pivotTables/pivotTable", mnId
+ 1),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable";);
@@ -1849,7 +1850,7 @@ void XclExpPivotTableManager::CreatePivotTables()
for( size_t nDPObj = 0, nCount = pDPColl->GetCount(); nDPObj < nCount;
++nDPObj )
if( ScDPObject* pDPObj = (*pDPColl)[ nDPObj ] )
if( const XclExpPivotCache* pPCache = CreatePivotCache(
*pDPObj ) )
-maPTableList.AppendNewRecord( new XclExpPivotTable(
GetRoot(), *pDPObj, *pPCache ) );
+maPTableList.AppendNewRecord( new XclExpPivotTable(
GetRoot(), *pDPObj, *pPCache, nDPObj ) );
}
XclExpRecordRef XclExpPivotTableManager::CreatePivotCachesRecord()
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index efcbbab..6f5a9a4 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -344,7 +344,7 @@ class XclExpPivotTable : public XclExpRecordBase, protected
XclExpRoot
{
public:
explicitXclExpPivotTable( const XclExpRoot& rRoot,
-const ScDPObject& rDPObj, const XclExpPivotCache&
rPCache );
+const ScDPObject& rDPObj, const XclExpPivotCache&
rPCache, size_t nId );
/** Returns a pivot cache field. */
const XclExpPCField* GetCacheField( sal_uInt16 nCacheIdx ) const;
@@ -422,6 +422,7 @@ private:
SCTAB mnOutScTab; /// Sheet index of the output
range.
boolmbValid;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-1' - sc/source
sc/source/core/data/dociter.cxx | 388
1 file changed, 280 insertions(+), 108 deletions(-)
New commits:
commit 1c49a6b61200fef0f6263c074282b2127359bb15
Author: Kohei Yoshida
Date: Thu Feb 13 14:45:47 2014 -0500
fdo#74558: Re-implement BinarySearch() to disregard empty cell blocks.
The old code before the calc core refactoring took advantage of the old
calc storage which did not store empty cells at all. The new storage does
"store" empty cell blocks, and it did negatively affect the binary search
used for VLOOKUP. The revised binary search code properly skips empty cell
blocks so that it will work more like the old algorithm in 4.1.
This change also fixes fdo#72348, which was caused by the same root cause.
Change-Id: Ic20cc54d8dae26b62f5e9193cd21dad06ad10a3e
(cherry picked from commit 377d749ff8211fa9e69d47a92810af9bc0652990)
Reviewed-on: https://gerrit.libreoffice.org/8043
Reviewed-by: Norbert Thiebaud
Reviewed-by: Andras Timar
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index d93ee06..5758c52 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -62,6 +62,14 @@ void incBlock(std::pair<_Iter, size_t>& rPos)
}
template
+void decBlock(std::pair<_Iter, size_t>& rPos)
+{
+// Move to the last element of the previous block.
+--rPos.first;
+rPos.second = rPos.first->size - 1;
+}
+
+template
void incPos(std::pair<_Iter, size_t>& rPos)
{
if (rPos.second + 1 < rPos.first->size)
@@ -1434,6 +1442,204 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL& nFoundCol,
return (nFoundCol <= MAXCOL) && (nFoundRow <= MAXROW);
}
+namespace {
+
+/**
+ * This class sequentially indexes non-empty cells in order, from the top of
+ * the block where the start row position is, to the bottom of the block
+ * where the end row position is. It skips all empty blocks that may be
+ * present in between.
+ *
+ * The index value is an offset from the first element of the first block
+ * disregarding all empty cell blocks.
+ */
+class NonEmptyCellIndexer
+{
+typedef std::map BlockMapType;
+
+BlockMapType maBlockMap;
+
+const sc::CellStoreType& mrCells;
+SCROW mnStartRow;
+SCROW mnEndRow;
+
+size_t mnLowIndex;
+size_t mnHighIndex;
+
+bool mbValid;
+
+public:
+
+typedef std::pair CellType;
+
+/**
+ * @param rCells cell storage container
+ * @param nStartRow logical start row position
+ * @param nEndRow logical end row position, inclusive.
+ * @param bSkipTopStrBlock when true, skip all leading string cells.
+ */
+NonEmptyCellIndexer(
+const sc::CellStoreType& rCells, SCROW nStartRow, SCROW nEndRow, bool
bSkipTopStrBlock ) :
+mrCells(rCells), mnStartRow(nStartRow), mnEndRow(nEndRow),
mnLowIndex(0), mnHighIndex(0), mbValid(true)
+{
+if (nEndRow < nStartRow)
+{
+mbValid = false;
+return;
+}
+
+// Find the low position.
+
+sc::CellStoreType::const_position_type aLoPos =
mrCells.position(nStartRow);
+if (aLoPos.first->type == sc::element_type_empty)
+incBlock(aLoPos);
+
+if (aLoPos.first == rCells.end())
+{
+mbValid = false;
+return;
+}
+
+if (bSkipTopStrBlock)
+{
+// Skip all leading string or empty blocks.
+while (aLoPos.first->type == sc::element_type_string ||
+ aLoPos.first->type == sc::element_type_edittext ||
+ aLoPos.first->type == sc::element_type_empty)
+{
+incBlock(aLoPos);
+if (aLoPos.first == rCells.end())
+{
+mbValid = false;
+return;
+}
+}
+}
+
+SCROW nFirstRow = aLoPos.first->position;
+SCROW nLastRow = aLoPos.first->position + aLoPos.first->size - 1;
+
+if (nFirstRow > nEndRow)
+{
+// Both start and end row positions are within the leading skipped
+// blocks.
+mbValid = false;
+return;
+}
+
+// Calculate the index of the low position.
+if (nFirstRow < nStartRow)
+mnLowIndex = nStartRow - nFirstRow;
+else
+{
+// Start row is within the skipped block(s). Set it to the first
+// element of the low block.
+mnLowIndex = 0;
+}
+
+if (nEndRow < nLastRow)
+{
+assert(nEndRow > nFirstRow);
+mnHighIndex = nEndRow - nFirstRow;
+
+maBlockMap.insert(BlockMapType::value_type(aLoPos.first->size,
aLoPos.first));
+return;
+}
+
+// Find the high position.
+
+sc::CellStoreType::
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/tokenstringcontext.hxx |1 +
sc/source/core/tool/compiler.cxx |1 +
sc/source/core/tool/tokenstringcontext.cxx |6 ++
sc/source/filter/xml/xmlexprt.cxx | 20 +---
sc/source/filter/xml/xmlexprt.hxx |7 +++
5 files changed, 28 insertions(+), 7 deletions(-)
New commits:
commit fc7d5cfe5611a90beb16c15cc0a2304ef2c15acc
Author: Kohei Yoshida
Date: Sat Feb 15 10:12:52 2014 -0500
fdo#74512: Fix the ODS export as well.
Change-Id: I54a2b2f405f9172d2ec5646346ef4e8a7ae27cb2
(cherry picked from commit 9a5ce676ede4828db0acde5db79d91320575ec08)
Reviewed-on: https://gerrit.libreoffice.org/8074
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index 3740f60..aa61ada 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -56,6 +56,7 @@ class CompileFormulaContext
public:
CompileFormulaContext( ScDocument* pDoc );
+CompileFormulaContext( ScDocument* pDoc, formula::FormulaGrammar::Grammar
eGram );
formula::FormulaGrammar::Grammar getGrammar() const;
void setGrammar( formula::FormulaGrammar::Grammar eGram );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 13b3a85..22a5035 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1628,6 +1628,7 @@ void ScCompiler::CheckTabQuotes( OUString& rString,
case FormulaGrammar::CONV_XL_A1 :
case FormulaGrammar::CONV_XL_R1C1 :
case FormulaGrammar::CONV_XL_OOX :
+case FormulaGrammar::CONV_ODF :
if( bNeedsQuote )
{
const OUString one_quote('\'');
diff --git a/sc/source/core/tool/tokenstringcontext.cxx
b/sc/source/core/tool/tokenstringcontext.cxx
index 203d36a..7586a31 100644
--- a/sc/source/core/tool/tokenstringcontext.cxx
+++ b/sc/source/core/tool/tokenstringcontext.cxx
@@ -114,6 +114,12 @@ CompileFormulaContext::CompileFormulaContext( ScDocument*
pDoc ) :
updateTabNames();
}
+CompileFormulaContext::CompileFormulaContext( ScDocument* pDoc,
formula::FormulaGrammar::Grammar eGram ) :
+mpDoc(pDoc), meGram(eGram)
+{
+updateTabNames();
+}
+
void CompileFormulaContext::updateTabNames()
{
// Fetch all sheet names.
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 62c0da4..d5c025d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -63,6 +63,7 @@
#include
#include
#include
+#include
#include
#include
@@ -3175,21 +3176,26 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32
nEqualCellCount)
{
if (aCell.maBaseCell.meType == CELLTYPE_FORMULA)
{
-OUStringBuffer sFormula;
ScFormulaCell* pFormulaCell = aCell.maBaseCell.mpFormula;
if (!bIsMatrix || (bIsMatrix && bIsFirstMatrixCell))
{
-const formula::FormulaGrammar::Grammar eGrammar =
pDoc->GetStorageGrammar();
-sal_uInt16 nNamespacePrefix = (eGrammar ==
formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
-pFormulaCell->GetFormula(sFormula, eGrammar);
-OUString sOUFormula(sFormula.makeStringAndClear());
+if (!mpCompileFormulaCxt)
+{
+const formula::FormulaGrammar::Grammar eGrammar =
pDoc->GetStorageGrammar();
+mpCompileFormulaCxt.reset(new
sc::CompileFormulaContext(pDoc, eGrammar));
+}
+
+OUString aFormula =
pFormulaCell->GetFormula(*mpCompileFormulaCxt);
+sal_uInt16 nNamespacePrefix =
+(mpCompileFormulaCxt->getGrammar() ==
formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
+
if (!bIsMatrix)
{
-AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula, false ));
+AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey(nNamespacePrefix, aFormula, false));
}
else
{
-AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula.copy(1,
sOUFormula.getLength() - 2), false ));
+AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey(nNamespacePrefix, aFormula.copy(1,
aFormula.getLength()-2), false));
}
}
if (pFormulaCell->GetErrCode())
diff --git a/sc/source/filter/xml/xmlexprt.hxx
b/sc/sourc
Re: mono + RHEL 6.4
On Mon, Feb 17, 2014 at 02:42:04PM +0100, Stephan Bergmann wrote: > There's currently no support for Mono in LibreOffice, C# is only > supported on Windows. There, the CLI-representations > (unoidl.com.sun.star.*) of the UNOIDL (com.sun.star.*) entities from > udkapi are in cli_uretypes.dll (built at > cli_ure/CliUnoApi_cli_uretypes.mk) and those from offapi are in > cli_oootypes.idl (built at unoil/CliUnoApi_oootypes.mk). FWIW, there was some work related to that, see the "[mono]" patches at http://cgit.freedesktop.org/libreoffice/core/log/?h=distro/suse/suse-4.0&qt=grep&q=mono but they weren't ever in master, nor anybody ported them to 4.1+. Just in case someone is interested in this, then don't start from scratch, but first pick up those patches as a start. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: VLOOKUP fix
On Fri, 2014-02-14 at 10:26 -0500, Kohei Yoshida wrote: > Hi there, > > I'd like to request an expedited backport of one recent fix of mine to > 4.2 and 4.2.1. And the 4.2.1 backport still needs 2 more acks. > https://gerrit.libreoffice.org/8043 > And we should get this one in sooner rather than later. This still holds true. Thanks, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/dml-shape-relsize.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10
sw/source/filter/ww8/docxsdrexport.cxx | 23 +++
3 files changed, 33 insertions(+)
New commits:
commit 2d93aee9bf614f8db176a34b04c20eb8ae3beb9e
Author: Miklos Vajna
Date: Mon Feb 17 14:31:12 2014 +0100
DOCX export: handle relative size of drawinglayer shapes
Change-Id: If4548f7b7a530402158ce5f84febe4fe5eaf2184
diff --git a/sw/qa/extras/ooxmlexport/data/dml-shape-relsize.docx
b/sw/qa/extras/ooxmlexport/data/dml-shape-relsize.docx
new file mode 100644
index 000..80ae02e
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/dml-shape-relsize.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5cc672f..86b1d84 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -153,6 +153,7 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const
OString& rXPath)
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wps"),
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingShape";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wpg"),
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wp"),
BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wp14"),
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("a"),
BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/main";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("pic"),
BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/picture";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("rels"),
BAD_CAST("http://schemas.openxmlformats.org/package/2006/relationships";));
@@ -2298,6 +2299,15 @@ DECLARE_OOXMLEXPORT_TEST(testDmlZorder, "dml-zorder.odt")
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Choice/w:drawing/wp:anchor",
"relativeHeight", "2");
}
+DECLARE_OOXMLEXPORT_TEST(testDmlShapeRelsize, "dml-shape-relsize.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// Relative size wasn't exported at all.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH",
"relativeFrom", "page");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark,
"testTrackChangesDeletedParagraphMark.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 2919806..1211ef3 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -486,6 +486,29 @@ void DocxSdrExport::Impl::writeDMLDrawing(const SdrObject*
pSdrObject, const SwF
pFS->endElementNS(XML_a, XML_graphicData);
pFS->endElementNS(XML_a, XML_graphic);
+// Relative size of the drawing.
+if (pSdrObject->GetRelativeWidth())
+{
+// At the moment drawinglayer objects are always relative from page.
+pFS->startElementNS(XML_wp14, XML_sizeRelH,
+XML_relativeFrom, "page",
+FSEND);
+pFS->startElementNS(XML_wp14, XML_pctWidth, FSEND);
+pFS->writeEscaped(OUString::number(*pSdrObject->GetRelativeWidth() *
100 * oox::drawingml::PER_PERCENT));
+pFS->endElementNS(XML_wp14, XML_pctWidth);
+pFS->endElementNS(XML_wp14, XML_sizeRelH);
+}
+if (pSdrObject->GetRelativeHeight())
+{
+pFS->startElementNS(XML_wp14, XML_sizeRelV,
+XML_relativeFrom, "page",
+FSEND);
+pFS->startElementNS(XML_wp14, XML_pctHeight, FSEND);
+pFS->writeEscaped(OUString::number(*pSdrObject->GetRelativeHeight() *
100 * oox::drawingml::PER_PERCENT));
+pFS->endElementNS(XML_wp14, XML_pctHeight);
+pFS->endElementNS(XML_wp14, XML_sizeRelV);
+}
+
m_rSdrExport.endDMLAnchorInline(pFrmFmt);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit 30155e08a0660b8574df3442fe7b9a8718708bf6
Author: Tor Lillqvist
Date: Mon Feb 17 15:42:25 2014 +0200
Seems that canvasfactory is needed by some docx docs
Change-Id: Ic9347e2077f314bec5cc2ba5f123f468c91b612e
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9b566c1..0e39c67 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -111,6 +111,7 @@ core_constructor_list = [
extended_core_factory_list = core_factory_list + [
("libanimcorelo.a", "animcore_component_getFactory"),
("libavmedialo.a", "avmedia_component_getFactory"),
+("libcanvasfactorylo.a", "canvasfactory_component_getFactory"),
("libchartcorelo.a", "chartcore_component_getFactory"),
("libcuilo.a", "cui_component_getFactory"),
("libembobj.a", "embobj_component_getFactory"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: mono + RHEL 6.4
On 02/17/2014 02:28 PM, Gorbachev Ivan wrote: Hello. How to use LibreOffice through C# in mono? Inside all example containce "unoidl.com.sun.star" namecpace, but where to get that library? There's currently no support for Mono in LibreOffice, C# is only supported on Windows. There, the CLI-representations (unoidl.com.sun.star.*) of the UNOIDL (com.sun.star.*) entities from udkapi are in cli_uretypes.dll (built at cli_ure/CliUnoApi_cli_uretypes.mk) and those from offapi are in cli_oootypes.idl (built at unoil/CliUnoApi_oootypes.mk). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/rtl sal/util
include/rtl/string.hxx |2 ++
include/rtl/ustring.hxx | 15 +++
sal/util/sal.map|7 ++-
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 4cf0d8edaf1581c42949ad2cbb40183a2f657ddd
Author: Muthu Subramanian
Date: Mon Feb 17 16:12:57 2014 +0530
String cleanups.
Change-Id: Ibebf394d69ed4845d91176727f291187ba35ed34
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 24bb980..5eb4fcf 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -898,6 +898,8 @@ public:
@return a hash code value of the string data
@see hashCode() for simple hashes
+
+ @since LibreOffice 4.3
*/
sal_uInt64 hashCode64() const SAL_THROW(())
{
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index f1a5f4a..9f9a956 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1227,6 +1227,21 @@ public:
}
/**
+ Returns a 64bit hash of the string data.
+ This hashes the entire data, while hashCode would do sampling for larger
string sizes.
+
+ @return a hash code value of the string data
+
+ @see hashCode() for simple hashes
+
+ @since LibreOffice 4.3
+*/
+sal_uInt64 hashCode64() const SAL_THROW(())
+{
+return rtl_ustr_hashCode64_WithLength( pData->buffer, pData->length );
+}
+
+/**
Returns a hashcode for this string.
@return a hash code value for this object.
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 470da31..074eb7b 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -221,7 +221,6 @@ UDK_3_0_0 {
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength;
rtl_str_hashCode;
rtl_str_hashCode_WithLength;
-rtl_str_hashCode64_WithLength;
rtl_str_indexOfChar;
rtl_str_indexOfChar_WithLength;
rtl_str_indexOfStr;
@@ -671,6 +670,12 @@ LIBO_UDK_4.2 { # symbols available in >= LibO 4.2
rtl_ustr_toUInt32;
} LIBO_UDK_4.1;
+LIBO_UDK_4.3 { #symbols available in >= LibO 4.3
+global:
+ rtl_str_hashCode64_WithLength;
+ rtl_ustr_hashCode64_WithLength;
+} LIBO_UDK_4.2;
+
PRIVATE_1.0 {
global:
osl_detail_ObjectRegistry_storeAddresses;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
mono + RHEL 6.4
Hello. How to use LibreOffice through C# in mono? Inside all example containce "unoidl.com.sun.star" namecpace, but where to get that library? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |3 +++ 1 file changed, 3 insertions(+) New commits: commit d5995b3f6713839e0f03774664ea4bd9664e6323 Author: Tor Lillqvist Date: Mon Feb 17 14:44:28 2014 +0200 More components needed by finalPaper.docx Change-Id: I7ab959ad227d77722a14a2cfa7addc55b58dc219 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index c8eb5c6..9b566c1 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -96,7 +96,10 @@ core_constructor_list = [ # svx/util/svx.component "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation", # svx/util/svxcore.component +"com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation", +"com_sun_star_comp_Draw_GraphicExporter_get_implementation", "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation", +"com_sun_star_comp_Svx_GraphicImportHelper_get_implementation", # toolkit/util/tk.component "stardiv_Toolkit_VCLXToolkit_get_implementation", # uui/util/uui.component ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DialogModel.cxx |2 +-
chart2/source/controller/dialogs/DialogModel.hxx |8
chart2/source/controller/dialogs/tp_DataSource.cxx |2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1113c243b100fa5258d7fc1e72e3afd5d9f871e8
Author: Tor Lillqvist
Date: Mon Feb 17 14:31:47 2014 +0200
Don't violate the One Definition Rule
There were two different struct types called chart::TimeBasedInfo,
which caused problems at least in statically linked iOS app.
Rename the other struct to chart::DialogModelTimeBasedInfo for now.
Change-Id: Ib95736b1046c5bd9001d7aeba2b8bbd22a18f8c2
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index c7903f0..b88581f 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -367,7 +367,7 @@ struct lcl_addSeriesNumber : public ::std::binary_function<
namespace chart
{
-TimeBasedInfo::TimeBasedInfo():
+DialogModelTimeBasedInfo::DialogModelTimeBasedInfo():
bTimeBased(false),
nStart(0),
nEnd(0)
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx
b/chart2/source/controller/dialogs/DialogModel.hxx
index 244dd82..99a92b8 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -47,9 +47,9 @@ namespace chart
class RangeSelectionHelper;
-struct TimeBasedInfo
+struct DialogModelTimeBasedInfo
{
-TimeBasedInfo();
+DialogModelTimeBasedInfo();
bool bTimeBased;
sal_Int32 nStart;
@@ -153,7 +153,7 @@ public:
void setTimeBasedRange( bool bTimeBased, sal_Int32 nStart, sal_Int32 nEnd)
const;
-const TimeBasedInfo& getTimeBasedInfo() const { return maTimeBasedInfo; }
+const DialogModelTimeBasedInfo& getTimeBasedInfo() const { return
maTimeBasedInfo; }
void startControllerLockTimer();
@@ -194,7 +194,7 @@ private:
sal_Int32 countSeries() const;
ChartModel& getModel() const;
-mutable TimeBasedInfo maTimeBasedInfo;
+mutable DialogModelTimeBasedInfo maTimeBasedInfo;
};
} // namespace chart
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 2f18449..60cf54b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -986,7 +986,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit *
pField )
Reference< util::XModifiable > xModifiable(
m_rDialogModel.getChartModel(), uno::UNO_QUERY );
if( xModifiable.is() )
xModifiable->setModified( sal_True );
-const TimeBasedInfo& rInfo = m_rDialogModel.getTimeBasedInfo();
+const DialogModelTimeBasedInfo& rInfo =
m_rDialogModel.getTimeBasedInfo();
if(rInfo.bTimeBased)
{
m_rDialogModel.setTimeBasedRange(rInfo.bTimeBased,
rInfo.nStart, rInfo.nEnd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/dialog/mgetempl.cxx |5 +
sfx2/uiconfig/ui/managestylepage.ui | 10 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit a95888e6e62a702f4b9af4a68c44339b51dc283e
Author: Caolán McNamara
Date: Mon Feb 17 12:44:14 2014 +
Resolves: fdo#72233 too long style names over-stretch dialog
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index b087613..b340f34 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window*
pParent, const SfxItemS
{
get(m_pNameRo, "namero");
get(m_pNameRw, "namerw");
+m_pNameRo->set_width_request(m_pNameRw->get_preferred_size().Width());
get(m_pAutoCB, "autoupdate");
get(m_pFollowFt, "nextstyleft");
get(m_pFollowLb, "nextstyle");
m_pFollowLb->SetStyle(m_pFollowLb->GetStyle() | WB_SORT);
+const sal_Int32 nMaxWidth(62);
+m_pFollowLb->setMaxWidthChars(nMaxWidth);
get(m_pBaseFt, "linkedwithft");
get(m_pBaseLb, "linkedwith");
m_pBaseLb->SetStyle(m_pBaseLb->GetStyle() | WB_SORT);
+m_pBaseLb->setMaxWidthChars(nMaxWidth);
get(m_pFilterFt, "categoryft");
get(m_pFilterLb, "category");
m_pFilterLb->SetStyle(m_pFilterLb->GetStyle() | WB_SORT);
+m_pFilterLb->setMaxWidthChars(nMaxWidth);
get(m_pDescFt, "desc");
// this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui
b/sfx2/uiconfig/ui/managestylepage.ui
index 6835793..9798530 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
+
-
+
True
False
@@ -100,8 +101,6 @@
False
center
True
-0
-1
1
@@ -116,8 +115,6 @@
False
center
True
-0
-1
1
@@ -132,8 +129,6 @@
False
center
True
-0
-1
1
@@ -187,6 +182,7 @@
center
True
â
+52
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2014-1947-1.bmp |binary 1 file changed New commits: commit 26914637e0e2a7be9571e06e316fa1552527c11a Author: Caolán McNamara Date: Mon Feb 17 12:28:07 2014 + CVE-2014-1947: add testcase Change-Id: I71b1fa7cfb536e49801752ae8ba48428918b6a36 diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2014-1947-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2014-1947-1.bmp new file mode 100644 index 000..3815a1c Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2014-1947-1.bmp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/mt_MT.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c20e8fbcf5aa2d358a9bdff2c9adc0b354c3af59 Author: Caolán McNamara Date: Mon Feb 17 12:23:32 2014 + Resolves: fdo#45841 fix autocorrect of single quotes in Maltese Change-Id: Id37ad55b8994b7ed40cdd569a016a68c7386b551 diff --git a/i18npool/source/localedata/data/mt_MT.xml b/i18npool/source/localedata/data/mt_MT.xml index 299ac1b..11ee8f0 100644 --- a/i18npool/source/localedata/data/mt_MT.xml +++ b/i18npool/source/localedata/data/mt_MT.xml @@ -42,8 +42,8 @@ - â - â + â + â â â ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 24 commits - filter/source framework/source lotuswordpro/source sc/source sd/source sfx2/source svx/source sw/source
filter/source/pdf/impdialog.cxx |4
framework/source/uielement/toolbarmanager.cxx|2
lotuswordpro/source/filter/lwptablelayout.cxx|7 -
sc/source/core/data/documen2.cxx |2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 13 +-
sd/source/ui/view/drviews6.cxx |2
sfx2/source/control/bindings.cxx |2
svx/source/table/svdotable.cxx |2
svx/source/unodraw/UnoNamespaceMap.cxx |2
sw/source/core/access/accmap.cxx |2
sw/source/core/access/acctextframe.cxx | 23 ++---
sw/source/core/access/acctextframe.hxx |2
sw/source/core/doc/docfmt.cxx|2
sw/source/core/doc/poolfmt.cxx | 50 +++
sw/source/core/layout/hffrm.cxx |2
sw/source/core/layout/paintfrm.cxx |2
sw/source/core/unocore/unochart.cxx |5 -
sw/source/filter/ww8/ww8graf.cxx |2
sw/source/ui/app/docsh.cxx |7 -
sw/source/ui/dbui/selectdbtabledialog.cxx|2
sw/source/ui/misc/redlndlg.cxx |3
sw/source/ui/shells/basesh.cxx |3
sw/source/ui/uno/unotxdoc.cxx|4
23 files changed, 58 insertions(+), 87 deletions(-)
New commits:
commit 0beb64bfcdd02c17938396448f861b9fb55f20a3
Author: Noel Grandin
Date: Mon Feb 17 11:41:34 2014 +0200
cid#736789 dereference before null check
Change-Id: I657880e7ed37f9933efcfc110daae8b4c4791497
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 8083bfc..6145fcf 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1171,15 +1171,12 @@ SdrPage* ScShapeChildren::GetDrawPage() const
{
SCTAB nTab( mpViewShell->GetLocationData().GetPrintTab() );
SdrPage* pDrawPage = NULL;
-if (mpViewShell)
+ScDocument* pDoc = mpViewShell->GetDocument();
+if (pDoc && pDoc->GetDrawLayer())
{
-ScDocument* pDoc = mpViewShell->GetDocument();
-if (pDoc && pDoc->GetDrawLayer())
-{
-ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
-if (pDrawLayer->HasObjects() && (pDrawLayer->GetPageCount() >
nTab))
-pDrawPage =
pDrawLayer->GetPage(static_cast(static_cast(nTab)));
-}
+ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
+if (pDrawLayer->HasObjects() && (pDrawLayer->GetPageCount() > nTab))
+pDrawPage =
pDrawLayer->GetPage(static_cast(static_cast(nTab)));
}
return pDrawPage;
}
commit 4d15e903bf7d49a2bb2fa532037eb84429012a42
Author: Noel Grandin
Date: Mon Feb 17 11:37:23 2014 +0200
cid#736786 dereference before null check
Change-Id: I9cf201148c7cf90e95c88b7bf53e07f1ada9e229
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index e1f6ab5..2997993 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1029,7 +1029,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
if ( bVbaEnabled )
{
-SfxObjectShell* pSrcShell = pSrcDoc ? pSrcDoc->GetDocumentShell() :
NULL;
+SfxObjectShell* pSrcShell = pSrcDoc->GetDocumentShell();
if ( pSrcShell )
{
OUString aLibName("Standard");
commit 796b51a763d956e58e38af5643854ba3b49bc76a
Author: Noel Grandin
Date: Mon Feb 17 11:34:58 2014 +0200
cid#736782 dereference before null check
and reduce scope of some variables
Change-Id: I1aada9af15090ff2083354ea9b265b9e3d4e5c02
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index b8193b4..209c2ac 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1184,7 +1184,6 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell,
sal_uInt16 nRowID, sal_
pXFPara =
static_cast(pCell->FindFirstContent(enumXFContentPara));
if (!pXFPara)
return;
-XFColor aColor;
XFColor aNullColor = XFColor();
if ( pXFPara)
@@ -1196,8 +1195,8 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell,
sal_uInt16 nRowID, sal_
if (!sNumfmt.isEmpty())
{
pNumStyle = (XFNumberStyle*)pXFStyleManager->FindStyle(
sNumfmt);
-aColor = pNumStyle->GetColor();
-if (
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/frminf.cxx |2 +-
sw/source/core/text/itrcrsr.cxx | 12
sw/source/core/text/itrtxt.hxx |2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit 5a3ed3219d6d3bfc751b8f74e024887d85ac061d
Author: Stephan Bergmann
Date: Mon Feb 17 12:55:27 2014 +0100
SwTxtCursor::GetCrsrOfst nChgNode arg is only ever false/true
(resp. sal_False/True). This was MSHORT, with the accompanying
sal_Bool bChgNode = 1 < nChgNode;
check ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import,"
but
there appear to be no calls that would pass in a value > 1, at least not on
recent master.
Change-Id: If87cb08ecfa665bbd54929d98d0c8de8286ae9ec
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index c3eda66..fd16509 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -332,7 +332,7 @@ sal_Int32 SwTxtFrmInfo::GetBigIndent( sal_Int32& rFndPos,
return 0;
const Point aPoint( nNextIndent, aLine.Y() );
-rFndPos = aLine.GetCrsrOfst( 0, aPoint, sal_False );
+rFndPos = aLine.GetCrsrOfst( 0, aPoint, false );
if( 1 >= rFndPos )
return 0;
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index aa03472..e4a469d 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1292,7 +1292,7 @@ bool SwTxtCursor::GetCharRect( SwRect* pOrig, const
sal_Int32 nOfst,
* Return: Offset in String
*/
sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
- const MSHORT nChgNode, SwCrsrMoveState* pCMS ) const
+bool nChgNode, SwCrsrMoveState* pCMS )
const
{
// If necessary, as catch up, do the adjustment
GetAdjusted();
@@ -1736,13 +1736,9 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos,
const Point &rPoint,
// we many not return with COMPLETE_STRING as
value!
// (BugId: 9692 + Change in feshview)
SwFlyInCntFrm *pTmp = ( (SwFlyCntPortion*)pPor )->GetFlyFrm();
-sal_Bool bChgNode = 1 < nChgNode;
-if( !bChgNode )
-{
-SwFrm* pLower = pTmp->GetLower();
-if( pLower && (pLower->IsTxtFrm() ||
pLower->IsLayoutFrm()) )
-bChgNode = sal_True;
-}
+SwFrm* pLower = pTmp->GetLower();
+bool bChgNode = pLower
+&& (pLower->IsTxtFrm() || pLower->IsLayoutFrm());
Point aTmpPoint( rPoint );
if ( pFrm->IsRightToLeft() )
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index f56d10e..4942055 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -301,7 +301,7 @@ public:
bool GetEndCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
const long nMax = 0 );
sal_Int32 GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
-const MSHORT nChgNode, SwCrsrMoveState* = 0 ) const;
+bool nChgNode, SwCrsrMoveState* = 0 ) const;
// Respects ambiguities: For the implementation see below
const SwLineLayout *CharCrsrToLine( const sal_Int32 nPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/behinddoc.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/docxsdrexport.cxx |6 +-
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit ea47fed15792c1b046c0872d334d24b146ddf083
Author: Miklos Vajna
Date: Mon Feb 17 12:18:07 2014 +0100
DOCX export: try harder to detect in-background shapes
Change-Id: If7a4a5b9aad564d026173b942fd0b4a2fb52e157
diff --git a/sw/qa/extras/ooxmlexport/data/behinddoc.docx
b/sw/qa/extras/ooxmlexport/data/behinddoc.docx
new file mode 100755
index 000..f859d2e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/behinddoc.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3710bc2..5cc672f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2280,6 +2280,15 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle,
"dml-shape-title.docx")
CPPUNIT_ASSERT_EQUAL(OUString("Description"),
getProperty(getShape(1), "Description"));
}
+DECLARE_OOXMLEXPORT_TEST(testBehinddoc, "behinddoc.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// This was "0", shape was in the foreground.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor",
"behindDoc", "1");
+}
+
DECLARE_OOXMLEXPORT_TEST(testDmlZorder, "dml-zorder.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index cefb62f..2919806 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -200,7 +200,11 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size& rS
if (isAnchor)
{
::sax_fastparser::FastAttributeList* attrList =
m_pImpl->m_pSerializer->createAttrList();
-attrList->add(XML_behindDoc, pFrmFmt->GetOpaque().GetValue() ? "0" :
"1");
+bool bOpaque = pFrmFmt->GetOpaque().GetValue();
+if (const SdrObject* pObj = pFrmFmt->FindRealSdrObject())
+// SdrObjects know their layer, consider that instead of the frame
format.
+bOpaque = pObj->GetLayer() != pFrmFmt->GetDoc()->GetHellId() &&
pObj->GetLayer() != pFrmFmt->GetDoc()->GetInvisibleHellId();
+attrList->add(XML_behindDoc, bOpaque ? "0" : "1");
attrList->add(XML_distT,
OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr());
attrList->add(XML_distB,
OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr());
attrList->add(XML_distL,
OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96e2b15277e7eba5938b9cb02cfd1fb732fe479f Author: Caolán McNamara Date: Mon Feb 17 11:24:57 2014 + Updated core Project: help 45ca39c87e40aee0d370737d0c6eb148777bcc65 diff --git a/helpcontent2 b/helpcontent2 index 951014e..45ca39c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 951014ee02c741fccaea82b26e2273fbf29ad916 +Subproject commit 45ca39c87e40aee0d370737d0c6eb148777bcc65 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/AllLangResTarget_dbu.mk |1
dbaccess/UIConfig_dbaccess.mk|1
dbaccess/source/ui/dlg/dbfindex.cxx | 140 +---
dbaccess/source/ui/dlg/dbfindex.hrc | 46
dbaccess/source/ui/dlg/dbfindex.hxx | 33 +--
dbaccess/source/ui/dlg/dbfindex.src | 187 -
dbaccess/source/ui/inc/dbu_resource.hrc |1
dbaccess/uiconfig/ui/dbaseindexdialog.ui | 338 +++
8 files changed, 412 insertions(+), 335 deletions(-)
New commits:
commit e9d2a160cb3e04461974245bee944942b84f5bc9
Author: Caolán McNamara
Date: Mon Feb 17 11:14:36 2014 +
convert DBase index dialog to .ui
Change-Id: I64ab68d22194ec4b6de9cd8c6c588ed7cd8d7f20
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index af9c757..3103def 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/dbadmin2.src \
dbaccess/source/ui/dlg/dbadminsetup.src \
dbaccess/source/ui/dlg/dbadmin.src \
-dbaccess/source/ui/dlg/dbfindex.src \
dbaccess/source/ui/dlg/directsql.src \
dbaccess/source/ui/dlg/indexdialog.src \
dbaccess/source/ui/dlg/paramdialog.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index ce70f56..9c46d80 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/choosedatasourcedialog \
dbaccess/uiconfig/ui/colwidthdialog \
+dbaccess/uiconfig/ui/dbaseindexdialog \
dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/fielddialog \
dbaccess/uiconfig/ui/finalpagewizard \
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx
b/dbaccess/source/ui/dlg/dbfindex.cxx
index fbf0dfb..5a05141 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -23,7 +23,6 @@
#include
#include "moduledbu.hxx"
#include "dbu_dlg.hrc"
-#include "dbfindex.hrc"
#include
#include
#include
@@ -41,45 +40,40 @@ using namespace ::svt;
const OString aGroupIdent("dBase III");
-ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, OUString aDataSrcName )
-: ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ),
-aPB_OK( this, ModuleRes( PB_OK ) ),
-aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ),
-aPB_HELP( this, ModuleRes( PB_HELP ) ),
-m_FT_Tables(this, ModuleRes( FT_TABLES ) ),
-aCB_Tables( this, ModuleRes( CB_TABLES ) ),
-m_FL_Indexes( this, ModuleRes( FL_INDEXES ) ),
-m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ),
-aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ),
-m_FT_AllIndexes(this, ModuleRes( FT_ALLINDEXES ) ),
-aLB_FreeIndexes(this, ModuleRes( LB_FREEINDEXES ) ),
-aIB_Add(this, ModuleRes( IB_ADD ) ),
-aIB_Remove( this, ModuleRes( IB_REMOVE ) ),
-aIB_AddAll( this, ModuleRes( IB_ADDALL ) ),
-aIB_RemoveAll( this, ModuleRes( IB_REMOVEALL ) ),
-m_aDSN(aDataSrcName),
-m_bCaseSensitiv(sal_True)
+ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, OUString aDataSrcName)
+: ModalDialog(pParent, "DBaseIndexDialog",
"dbaccess/ui/dbaseindexdialog.ui")
+, m_aDSN(aDataSrcName)
+, m_bCaseSensitiv(true)
{
-
-aCB_Tables.SetSelectHdl( LINK(this, ODbaseIndexDialog, TableSelectHdl) );
-aIB_Add.SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) );
-aIB_Remove.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveClickHdl) );
-aIB_AddAll.SetClickHdl( LINK(this, ODbaseIndexDialog, AddAllClickHdl) );
-aIB_RemoveAll.SetClickHdl( LINK(this, ODbaseIndexDialog,
RemoveAllClickHdl) );
-aPB_OK.SetClickHdl( LINK(this, ODbaseIndexDialog, OKClickHdl) );
-
-aLB_FreeIndexes.SetSelectHdl( LINK(this, ODbaseIndexDialog,
OnListEntrySelected) );
-aLB_TableIndexes.SetSelectHdl( LINK(this, ODbaseIndexDialog,
OnListEntrySelected) );
-
-aCB_Tables.SetDropDownLineCount(8);
+get(m_pPB_OK, "ok");
+get(m_pCB_Tables, "table");
+get(m_pIndexes, "frame");
+get(m_pLB_TableIndexes, "tableindex");
+get(m_pLB_FreeIndexes, "freeindex");
+Size aSize(LogicToPixel(Size(76, 98), MAP_APPFONT));
+m_pLB_TableIndexes->set_height_request(aSize.Height());
+m_pLB_TableIndexes->set_width_request(aSize.Width());
+m_pLB_FreeIndexes->set_height_request(aSize.Height());
+m_pLB_FreeIndexes->set_width_request(aSize.Width());
+get(m_pAdd, "add");
+get(m_pAddAll, "addall");
+get(m_pRemove, "remove");
+get(m_pRemoveAll, "removeall");
+
+
+m_pCB_Tables->SetSelectHdl( LINK(this, ODbaseIndexDialog, TableSelectHdl)
);
+m_pAdd->SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) );
+m
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |8 -- source/text/shared/explorer/database/11030100.xhp | 29 +++--- 2 files changed, 15 insertions(+), 22 deletions(-) New commits: commit 45ca39c87e40aee0d370737d0c6eb148777bcc65 Author: Caolán McNamara Date: Mon Feb 17 11:24:57 2014 + update help ids for dbase index dialog .ui conversion Change-Id: I3d1afde2143a94fe456cda55677178016950283e diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index b0863c7..4af0655 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5464,7 +5464,6 @@ dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041, dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953, dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349, dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350, -dbaccess_ComboBox_DLG_DBASE_INDEXES_CB_TABLES,1388335105, dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193, dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589, dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588, @@ -5491,10 +5490,6 @@ dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392, dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080, dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER,1388768769, dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP,1388768770, -dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_ADD,1388342785, -dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_ADDALL,1388342787, -dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_REMOVE,1388342786, -dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_REMOVEALL,1388342788, dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH,851602948, dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_RH,851602947, dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_LH,851602946, @@ -5504,12 +5499,9 @@ dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT,851635726, dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121, -dbaccess_ListBox_DLG_DBASE_INDEXES_LB_FREEINDEXES,1388334594, -dbaccess_ListBox_DLG_DBASE_INDEXES_LB_TABLEINDEXES,1388334593, dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129, dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299, dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536, -dbaccess_ModalDialog_DLG_DBASE_INDEXES,1388331008, dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, diff --git a/source/text/shared/explorer/database/11030100.xhp b/source/text/shared/explorer/database/11030100.xhp index b910b71..35a0f35 100644 --- a/source/text/shared/explorer/database/11030100.xhp +++ b/source/text/shared/explorer/database/11030100.xhp @@ -29,24 +29,25 @@ + Indexes Lets you organize dBASE database indexes. An index allows you to access a database quickly, provided that you query the data in the selection that was defined through the index. When you design a table, you can define the indexes on the Indexes tab page. -Table -Select the database table that you want to index. -Table Indexes -Lists the current indexes for the selected database table. To remove an index from the list, click the index, and then click the right arrow. -Free Indexes -Lists the available indexes that you can assign to a table. To assign an index to a selected table, click the left arrow icon. The left double arrow assigns all available indexes. -< -Moves the selected index to the Table Indexes list. -<< -Moves all of the free indexes to the Table Indexes list. -> -Moves the selected table indexes to the Free Indexes list. ->> -Moves all of the table indexes to the Free Indexes list. +Table +Select the database table that you want to index. +Table Indexes +Lists the current indexes for the selected database table. To remove an index from the list, click the index, and then click the right arrow. +Free Indexes +Lists the available indexes that you can assign to a table. To assign an index to a selected table, click the left arrow icon. The left double arrow assigns all available indexes. +< +Moves the selected index to the Table Indexes list. +<< +Moves all of the free indexes to the Table Indexes list. +> +Moves the selected table indexes to the Free Indexes list. +>> +Moves all of the table indexes to the Free Indexes list. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docnum.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e16614f440aae289316531113050c6b70d194b7a
Author: Stephan Bergmann
Date: Mon Feb 17 12:05:45 2014 +0100
loplugin:literaltoboolconversion
Change-Id: Ibb9b21806e73ddb0071e906fd200efce515055a0
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index b907831..9689f86 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2083,7 +2083,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool
bDel )
GetIDocumentUndoRedo().AppendUndo(pUndo);
}
}
-else if (bDel && pTxtNd->GetNumRule(sal_False) &&
+else if (bDel && pTxtNd->GetNumRule(false) &&
pTxtNd->GetActualListLevel() >= 0 &&
pTxtNd->GetActualListLevel() < MAXLEVEL)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0f/11a9d487744af6c50e9f1d547c22cd4bdeab48
0f/11a9d487744af6c50e9f1d547c22cd4bdeab48 |1 + 1 file changed, 1 insertion(+) New commits: commit 6af095ae94d529887b37dc1aa3f5d529bc4548f2 Author: Caolán McNamara Date: Mon Feb 17 10:54:00 2014 + Notes added by 'git notes add' diff --git a/0f/11a9d487744af6c50e9f1d547c22cd4bdeab48 b/0f/11a9d487744af6c50e9f1d547c22cd4bdeab48 new file mode 100644 index 000..19b923d --- /dev/null +++ b/0f/11a9d487744af6c50e9f1d547c22cd4bdeab48 @@ -0,0 +1 @@ +merged as: a51929600789af4d67e4f52226f8f5ae13ed58ba ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/source chart2/uiconfig dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk sd/inc sd/source xmloff/sourc
chart2/source/controller/dialogs/dlg_PropertyMapping.cxx |5
chart2/uiconfig/ui/dlg_PropertyMapping.ui| 147 --
dbaccess/AllLangResTarget_dbu.mk |1
dbaccess/UIConfig_dbaccess.mk|1
dbaccess/source/ui/dlg/dsselect.cxx | 65 +++---
dbaccess/source/ui/dlg/dsselect.hrc | 35 ---
dbaccess/source/ui/dlg/dsselect.hxx | 16 -
dbaccess/source/ui/dlg/dsselect.src | 98 -
dbaccess/source/ui/inc/dbu_resource.hrc |1
dbaccess/uiconfig/ui/choosedatasourcedialog.ui | 125
sd/inc/EffectMigration.hxx |2
sd/source/core/EffectMigration.cxx | 150 ++-
sd/source/ui/dlg/animobjs.cxx| 64 +++---
sd/source/ui/unoidl/unoobj.cxx | 35 +++
xmloff/source/draw/animimp.cxx |5
15 files changed, 474 insertions(+), 276 deletions(-)
New commits:
commit 829a2f9b1f978db92d7cf50a30feead5128bce9f
Author: Caolán McNamara
Date: Mon Feb 17 10:43:52 2014 +
this dialog is unfinished, but fix it to not crash
Change-Id: Icb6d1d1bb14678eb711100644f3f60725db4b5db
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
index c41859f..8022c5d 100644
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
+++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
@@ -21,8 +21,9 @@ static long pListBoxTabs[] =
}
-PropertyMappingDlg::PropertyMappingDlg(Window* pParent):
-ModalDialog(pParent, "Property Mapping Dialog",
"modules/schart/ui/dlg_PropertyMapping.ui")
+PropertyMappingDlg::PropertyMappingDlg(Window* pParent)
+: ModalDialog(pParent, "PropertyMappingDialog",
+"modules/schart/ui/dlg_PropertyMapping.ui")
{
get(mpMappingTable, "LST_PROPERTY_MAPPING");
diff --git a/chart2/uiconfig/ui/dlg_PropertyMapping.ui
b/chart2/uiconfig/ui/dlg_PropertyMapping.ui
index 55ae428..cbdd35b 100644
--- a/chart2/uiconfig/ui/dlg_PropertyMapping.ui
+++ b/chart2/uiconfig/ui/dlg_PropertyMapping.ui
@@ -3,50 +3,20 @@
-
+
False
+6
+Add Property Mapping
dialog
-
-
-True
+
+
False
vertical
-
-
-True
-False
-Select property
mapping:
-
-
-False
-True
-0
-
-
-
-
-110
-110
-True
-True
-
-
-
-
-
-False
-True
-1
-
-
-
-
-True
+2
+
+
False
-6
-6
-6
-start
+end
Ok
@@ -77,40 +47,87 @@
False
True
-2
-
-
-
-
-False
-Color
-
-
-False
-True
-3
-
-
-
-
-False
-FillColor
-
-
-False
-True
-4
+end
+0
-
+
+True
False
-BorderColor
+vertical
+6
+
+
+True
+False
+0
+Select property
mapping:
+True
+LST_PROPERTY_MAPPING:border
+
+
+False
+True
+0
+
+
+
+
+110
+110
+True
+True
+True
+True
+
+
+
+
+
+False
+True
+1
+
+
+
+
+False
+Color
+
+
+False
+True
+2
+
+
+
+
+False
+FillColor
+
+
+False
+True
+3
+
+
+
+
+False
+BorderColor
+
+
+False
+True
+4
+
+
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/dbg_lay.hxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit f4b2c6f564a5e1e471fbd4276d9301b20e45d36d Author: Michael Stahl Date: Mon Feb 17 11:46:26 2014 +0100 sw: add missing solar.h Change-Id: I6e7721665efc3183e71db18289b016b7cd0ccd1c diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index c175c7c..c9b5254 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -53,6 +53,8 @@ #ifdef DBG_UTIL +#include + #include "swtypes.hxx" class SwImplProtocol; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |4 1 file changed, 4 deletions(-) New commits: commit 951014ee02c741fccaea82b26e2273fbf29ad916 Author: Caolán McNamara Date: Mon Feb 17 10:17:52 2014 + drop unused helpids Change-Id: I1d6d5f39ef21ad92d09c60bb7d3e99832b3f6516 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f733e01..b0863c7 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5504,13 +5504,11 @@ dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT,851635726, dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121, -dbaccess_ListBox_DLG_DATASOURCE_SELECTION_LB_DATASOURCE,1388383745, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_FREEINDEXES,1388334594, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_TABLEINDEXES,1388334593, dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129, dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299, dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536, -dbaccess_ModalDialog_DLG_DATASOURCE_SELECTION,1388380160, dbaccess_ModalDialog_DLG_DBASE_INDEXES,1388331008, dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, @@ -5530,8 +5528,6 @@ dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777, dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153, dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697, dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603, -dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_CREATE,1388384777, -dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_MANAGE,1388384773, dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529, dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158, dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f5dfc104f7984ac47eb104fea79f2908449c72bd Author: Caolán McNamara Date: Mon Feb 17 10:17:52 2014 + Updated core Project: help 951014ee02c741fccaea82b26e2273fbf29ad916 diff --git a/helpcontent2 b/helpcontent2 index 26c50c7..951014e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 26c50c746d85f1a0fd63246ccb5025f50c3200c9 +Subproject commit 951014ee02c741fccaea82b26e2273fbf29ad916 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |8
1 file changed, 8 insertions(+)
New commits:
commit f2ee8833799bda5d12892534a81429fefc14fae3
Author: Tor Lillqvist
Date: Mon Feb 17 12:45:27 2014 +0200
Add more stuff needed to show finalPaper.docx
Change-Id: I2b789ae3a6570b517ef30c662d845a7eca71f2e4
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 8d9cbeb..c8eb5c6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -17,9 +17,12 @@ from optparse import OptionParser
# referenced in lo_get_constructor_map().
core_factory_list = [
+("libembobj.a", "embobj_component_getFactory"),
("libintrospectionlo.a", "introspection_component_getFactory"),
("libreflectionlo.a", "reflection_component_getFactory"),
("libstocserviceslo.a", "stocservices_component_getFactory"),
+("libchartcontrollerlo.a", "chartcontroller_component_getFactory"),
+("libchartcorelo.a", "chartcore_component_getFactory"),
("libcomphelper.a", "comphelp_component_getFactory"),
("libconfigmgrlo.a", "configmgr_component_getFactory"),
("libdeployment.a", "deployment_component_getFactory"),
@@ -31,6 +34,7 @@ core_factory_list = [
("liblocalebe1lo.a", "localebe1_component_getFactory"),
("libooxlo.a", "oox_component_getFactory"),
("libpackage2.a", "package2_component_getFactory"),
+("libsmlo.a", "sm_component_getFactory"),
("libsotlo.a", "sot_component_getFactory"),
("libspelllo.a", "spell_component_getFactory"),
("libsrtrs1.a", "srtrs1_component_getFactory"),
@@ -80,15 +84,19 @@ core_constructor_list = [
# sax/source/expatwrap/expwrap.component
"com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
"com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
+"com_sun_star_extensions_xml_sax_Writer_get_implementation",
# sfx2/util/sfx.component
"SfxDocumentMetaData_get_implementation",
"com_sun_star_comp_office_FrameLoader_get_implementation",
"com_sun_star_comp_sfx2_DocumentTemplates_get_implementation",
"com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
# svtools/util/svt.component
+"com_sun_star_graphic_GraphicObject_get_implementation",
"com_sun_star_comp_graphic_GraphicProvider_get_implementation",
# svx/util/svx.component
"com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation",
+# svx/util/svxcore.component
+"com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
# toolkit/util/tk.component
"stardiv_Toolkit_VCLXToolkit_get_implementation",
# uui/util/uui.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60924] move libraries to autoinstallation in scp2
https://bugs.freedesktop.org/show_bug.cgi?id=60924 --- Comment #67 from Commit Notification --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=f703432dd1160edace1a2f457fb3b33a7322 fdo#60924: Move more libs/packages to autoinstall The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk Repository.mk scp2/source
Repository.mk | 10 +--- RepositoryExternal.mk | 25 +++-- scp2/source/ooo/file_library_ooo.scp | 40 -- scp2/source/ooo/module_hidden_ooo.scp |5 4 files changed, 25 insertions(+), 55 deletions(-) New commits: commit 32a617d8f00636d5cf660577c8cd47633b0bcd7e Author: Michael Stahl Date: Mon Feb 17 11:23:19 2014 +0100 move external packages registration to RepositoryExternal.mk (with condition from configure.ac for cairo) Change-Id: I7f4864a7f331f1a3da9c796b51f4e16c58382580 diff --git a/Repository.mk b/Repository.mk index 79afd37..87916df 100644 --- a/Repository.mk +++ b/Repository.mk @@ -706,15 +706,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\ ) \ )) -$(eval $(call gb_Helper_register_packages_for_install,ooo,\ - $(if $(SYSTEM_CURL),,curl) \ - $(if $(SYSTEM_LCMS2),,lcms2) \ - $(if $(SYSTEM_LIBXSLT),,xslt) \ - $(if $(SYSTEM_CAIRO),,cairo \ - $(if $(filter $(OS),WNT),,pixman) \ - ) \ -)) - # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ genbrk \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 23d5a6a..1133bb9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -871,6 +871,10 @@ endef else # !SYSTEM_LIBXSLT +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + xslt \ +)) + define gb_LinkTarget__use_libxslt $(call gb_LinkTarget_use_package,$(1),xslt) $(call gb_LinkTarget_set_include,$(1),\ @@ -1073,6 +1077,8 @@ endif # ANDROID endif # SYSTEM_REDLAND +ifneq ($(filter unx,$(GUIBASE))$(ENABLE_CAIRO_CANVAS),) # or + ifneq ($(SYSTEM_CAIRO),) define gb_LinkTarget__use_cairo @@ -1087,6 +1093,11 @@ endef else # !SYSTEM_CAIRO +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + cairo \ + $(if $(filter $(OS),WNT),,pixman) \ +)) + define gb_LinkTarget__use_cairo $(call gb_LinkTarget_use_package,$(1),cairo) $(call gb_LinkTarget_use_package,$(1),pixman) @@ -1107,6 +1118,8 @@ endef endif # SYSTEM_CAIRO +endif # CAIRO + ifneq ($(SYSTEM_FREETYPE),) define gb_LinkTarget__use_freetype_headers @@ -1810,6 +1823,10 @@ gb_ExternalProject__use_lcms2 := else # !SYSTEM_LCMS2 +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + lcms2 \ +)) + define gb_ExternalProject__use_lcms2 $(call gb_ExternalProject_use_package,$(1),lcms2) @@ -2093,6 +2110,10 @@ endef else # !SYSTEM_CURL +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + curl \ +)) + define gb_LinkTarget__use_curl $(call gb_LinkTarget_use_package,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ commit f703432dd1160edace1a2f457fb3b33a7322 Author: Marcos Paulo de Souza Date: Wed Feb 12 06:53:02 2014 -0200 fdo#60924: Move more libs/packages to autoinstall Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758 diff --git a/Repository.mk b/Repository.mk index b702ae3..79afd37 100644 --- a/Repository.mk +++ b/Repository.mk @@ -530,9 +530,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ sdbc2 \ sofficeapp \ srtrs1 \ + $(if $(filter $(OS),WNT),sysdtrans) \ textconv_dict \ ucb1 \ ucbhelper \ + $(if $(DISABLE_NEON),,ucpdav1) \ ucpfile1 \ ucpftp1 \ ucpchelp1 \ @@ -561,7 +563,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ - ucpdav1 \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -606,7 +607,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ regpatchactivex \ so_activex \ so_activex_x64 \ - sysdtrans \ thidxmsi \ )) endif @@ -710,6 +710,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(SYSTEM_CURL),,curl) \ $(if $(SYSTEM_LCMS2),,lcms2) \ $(if $(SYSTEM_LIBXSLT),,xslt) \ + $(if $(SYSTEM_CAIRO),,cairo \ + $(if $(filter $(OS),WNT),,pixman) \ + ) \ )) # External executables diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bb57257..23d5a6a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -969,7 +969,7 @@ endef else # !SYSTEM_NEON -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ neon \ )) @@ -2218,7 +2218,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ clucene \ )) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index c1
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/IDocumentLinksAdministration.hxx |2 --
sw/inc/IDocumentRedlineAccess.hxx | 11 ---
sw/inc/IDocumentSettingAccess.hxx |1 -
sw/inc/IDocumentState.hxx |2 --
sw/inc/accessibilityoptions.hxx |2 --
sw/inc/authratr.hxx |2 --
sw/inc/crsskip.hxx |3 +--
sw/inc/cshtyp.hxx |4
sw/inc/docfac.hxx |2 --
sw/inc/format.hxx |3 ---
sw/inc/hintids.hxx | 17 -
sw/inc/index.hxx| 11 ++-
sw/inc/itabenum.hxx |3 ---
sw/inc/mdiexp.hxx |1 -
sw/inc/ndtyp.hxx|4
sw/inc/pch/precompiled_msword.hxx |1 -
sw/inc/pch/precompiled_sw.hxx |1 -
sw/inc/splargs.hxx | 19 +++
sw/inc/swatrset.hxx |2 +-
sw/inc/swdbdata.hxx |1 -
sw/inc/swevent.hxx |2 --
sw/inc/swtypes.hxx |2 +-
sw/inc/swunohelper.hxx |1 -
sw/inc/swwait.hxx |1 -
sw/inc/tabcol.hxx |2 --
sw/inc/toxwrap.hxx |2 --
sw/inc/txatbase.hxx |9 -
sw/inc/txatritr.hxx |5 -
sw/inc/unocoll.hxx |9 ++---
sw/source/core/bastyp/index.cxx |7 ---
sw/source/core/inc/GetMetricVal.hxx |2 --
sw/source/core/inc/SwPortionHandler.hxx |1 -
sw/source/core/inc/drawfont.hxx |1 -
sw/source/core/inc/laycache.hxx |7 +++
sw/source/core/inc/unofldmid.h |2 --
sw/source/filter/html/htmlfly.hxx |2 +-
sw/source/filter/inc/rtf.hxx|2 --
sw/source/filter/inc/wrtswtbl.hxx | 19 +--
sw/source/filter/ww8/WW8Sttbf.hxx |1 -
sw/source/filter/xml/xmlexpit.hxx |1 -
sw/source/filter/xml/xmlimpit.hxx |2 --
sw/source/filter/xml/xmlitem.hxx|2 --
sw/source/ui/inc/fldmgr.hxx | 27 ++-
sw/source/ui/inc/initui.hxx |1 -
sw/source/ui/uiview/viewfunc.hxx|1 -
45 files changed, 49 insertions(+), 154 deletions(-)
New commits:
commit 067d08029384af6e620f0fc48e31ff2a740e1fc8
Author: Alexandre Vicenzi
Date: Sat Feb 15 01:13:52 2014 -0200
fdo#63154 Remove unused solar.h reference in sw.
Change-Id: I6e13f3705cb591573693cf60220e32aa823c5886
Reviewed-on: https://gerrit.libreoffice.org/8067
Tested-by: LibreOffice gerrit bot
Reviewed-by: Marcos Souza
diff --git a/sw/inc/IDocumentLinksAdministration.hxx
b/sw/inc/IDocumentLinksAdministration.hxx
index a0b3ee6..e72ad04 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
#define INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
-#include
-
namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
namespace sfx2 { class SvLinkSource; class LinkManager; }
diff --git a/sw/inc/IDocumentRedlineAccess.hxx
b/sw/inc/IDocumentRedlineAccess.hxx
index 48320be..0385fd2 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -21,10 +21,7 @@
#define INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
#include
- #include
-
#include
-
#include
class SwRangeRedline;
@@ -98,10 +95,6 @@ public:
public:
-/*
-Query
-*/
-
/** Query the currently set redline mode
@returns
@@ -137,10 +130,6 @@ public:
virtual bool IsInRedlines(const SwNode& rNode) const = 0;
-/***
-Manipulation
- ***/
-
/** Append a new redline
@param pPtr
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 6e66fd0..d33695a 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
#define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
-#include
#include
#include
#include
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index 9230dd3..e44b09d 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
#define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
- #include
-
/** Get information about the current document state
*/
class IDocumentState
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #52 from Commit Notification --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=067d08029384af6e620f0fc48e31ff2a740e1fc8 fdo#63154 Remove unused solar.h reference in sw. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/svg/svgexport.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 9cc2ab21d3e18d6ab331e06fd96309bad047615c
Author: Tomaž Vajngerl
Date: Thu Feb 13 20:17:58 2014 +0100
fdo#74218 add SVG header when exporting via mtf
Change-Id: Ia200fbf73c1464160ceddc705f72d77b5f1eff51
Reviewed-on: https://gerrit.libreoffice.org/8033
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6065416..065310f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -87,6 +87,8 @@ static const charaOOOAttrDateTimeFormat[] = NSPREFIX
"date-time-format";
// ooo xml attributes for Placeholder Shapes
static const charaOOOAttrTextAdjust[] = NSPREFIX "text-adjust";
+static const charconstSvgNamespace[] = "http://www.w3.org/2000/svg";;
+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -734,7 +736,7 @@ sal_Bool SVGFilter::implExportDocument()
// standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width",
OUString::number( 28.222 ) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round"
);
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns",
"http://www.w3.org/2000/svg"; );
+mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns",
OUString::createFromAscii(constSvgNamespace) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo",
"http://xml.openoffice.org/svg/export"; );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink",
"http://www.w3.org/1999/xlink"; );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" );
@@ -2305,6 +2307,16 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf )
aAttr += OUString::number( aSize.Height() * 100L );
AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
+AddAttribute( XML_NAMESPACE_NONE, "version", "1.1" );
+
+if( IsUseTinyProfile() )
+ AddAttribute( XML_NAMESPACE_NONE, "baseProfile", "tiny" );
+
+AddAttribute( XML_NAMESPACE_NONE, "xmlns",
OUString::createFromAscii(constSvgNamespace) );
+AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::number( 28.222
) );
+AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round" );
+AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" );
+
{
SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", sal_True,
sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/uiconfig
cui/uiconfig/ui/possizetabpage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 9416c973d6749c3f7476b55bb91a4ac222a914b1 Author: Tomaž Vajngerl Date: Sat Feb 15 15:29:02 2014 +0100 fdo#72967 Draw position size tab - min size is 0 not 1 (mm) Adjustment for size of an object had the minimum set to 1 (mm) instead of 0. Change-Id: I7d4c0998d2987448cea0fd7934649c02a513ac06 Reviewed-on: https://gerrit.libreoffice.org/8072 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index 65d83ef..25c48cb 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -500,7 +500,6 @@ 10 -1 100 1 10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/doc/notxtfrm.cxx| 56 +
sw/source/core/inc/frmtool.hxx |7
sw/source/core/layout/paintfrm.cxx | 11 ++-
3 files changed, 49 insertions(+), 25 deletions(-)
New commits:
commit 884aa71132efe05aed456a5ca0cfd69ca148939f
Author: Michael Stahl
Date: Fri Feb 14 22:18:27 2014 +0100
fdo#68927: sw: fix painting of SVG page background
There was a fix for a wrong constant resulting in too large image size in
a1a0830d1ac3ffabbe35bd8a0264b64f1f7a9d67, and it turns out that painting
of SVG backgrounds was relying on the wasteful rasterization: the SVG
is rasterized only once (at the initial zoom level) and then cached, and
now the correct image size for 100% is simply scaled up when zooming in.
Fix that by painting SVGs with the drawing layer primitives instead,
which appears to give better results.
Change-Id: I4be16856fd080290526d4963d8c512beefa85363
(cherry picked from commit c9cdc1252374a04f866c0715cb582cc08935d92d)
Reviewed-on: https://gerrit.libreoffice.org/8060
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 4d29dec..3dc2a3c 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -735,6 +735,36 @@ bool paintUsingPrimitivesHelper(
return false;
}
+
+void paintGraphicUsingPrimitivesHelper(OutputDevice & rOutputDevice,
+ Graphic const& rGraphic, GraphicAttr const& rGraphicAttr,
+ SwRect const& rAlignedGrfArea)
+{
+// unify using GraphicPrimitive2D
+// -> the primitive handles all crop and mirror stuff
+// -> the primitive renderer will create the needed pdf export data
+// -> if bitmap content, it will be cached system-dependent
+const basegfx::B2DRange aTargetRange(
+rAlignedGrfArea.Left(), rAlignedGrfArea.Top(),
+rAlignedGrfArea.Right(), rAlignedGrfArea.Bottom());
+const basegfx::B2DHomMatrix aTargetTransform(
+basegfx::tools::createScaleTranslateB2DHomMatrix(
+aTargetRange.getRange(),
+aTargetRange.getMinimum()));
+drawinglayer::primitive2d::Primitive2DSequence aContent(1);
+
+aContent[0] = new drawinglayer::primitive2d::GraphicPrimitive2D(
+aTargetTransform,
+rGraphic,
+rGraphicAttr);
+
+paintUsingPrimitivesHelper(
+rOutputDevice,
+aContent,
+aTargetRange,
+aTargetRange);
+}
+
/** Paint the graphic.
We require either a QuickDraw-Bitmap or a graphic here. If we do not have
@@ -857,30 +887,8 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect &rGrfArea ) cons
}
else
{
-// unify using GraphicPrimitive2D
-// -> the primitive handles all crop and mirror stuff
-// -> the primitive renderer will create the needed pdf
export data
-// -> if bitmap conent, it will be cached system-dependent
-const basegfx::B2DRange aTargetRange(
-aAlignedGrfArea.Left(), aAlignedGrfArea.Top(),
-aAlignedGrfArea.Right(), aAlignedGrfArea.Bottom());
-const basegfx::B2DHomMatrix aTargetTransform(
-basegfx::tools::createScaleTranslateB2DHomMatrix(
-aTargetRange.getRange(),
-aTargetRange.getMinimum()));
-drawinglayer::primitive2d::Primitive2DSequence aContent;
-
-aContent.realloc(1);
-aContent[0] = new
drawinglayer::primitive2d::GraphicPrimitive2D(
-aTargetTransform,
-rGrfObj.GetGraphic(),
-aGrfAttr);
-
-paintUsingPrimitivesHelper(
-*pOut,
-aContent,
-aTargetRange,
-aTargetRange);
+paintGraphicUsingPrimitivesHelper(*pOut,
+rGrfObj.GetGraphic(), aGrfAttr, aAlignedGrfArea);
}
}
else
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 3304351..02569bf 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -42,6 +42,8 @@ class XFillGradientItem;
class SdrMarkList;
class SwNodeIndex;
class OutputDevice;
+class Graphic;
+class GraphicAttr;
class SwPageDesc;
#define FAR_AWAY LONG_MAX - 2 // initial position of a Fly
@@ -57,6 +59,11 @@ void DrawGraphic( const SvxBrushItem *, const
XFillStyleItem*, const XFillGradie
const SwRect &rOrg, const SwRect &rOut, const sal_uInt8
nGrfNum = GRFNUM_NO,
const sal_Bool bConsiderBackgroundTransparency = sal_False );
+void paintGraph
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2c/73ea30530176cfc94d91b8dff2ca9e66ce7ea0
2c/73ea30530176cfc94d91b8dff2ca9e66ce7ea0 |1 + 1 file changed, 1 insertion(+) New commits: commit 4bba00d7f24cc7614a7e17802aa106576b7c701d Author: Caolán McNamara Date: Mon Feb 17 09:53:35 2014 + Notes added by 'git notes add' diff --git a/2c/73ea30530176cfc94d91b8dff2ca9e66ce7ea0 b/2c/73ea30530176cfc94d91b8dff2ca9e66ce7ea0 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/2c/73ea30530176cfc94d91b8dff2ca9e66ce7ea0 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9c/8dbca600bcb32f2d9888e1a15f7d415ac5526d
9c/8dbca600bcb32f2d9888e1a15f7d415ac5526d |1 + 1 file changed, 1 insertion(+) New commits: commit 8dcf0c4c1d5de2213fa759401624b6f79c36afb1 Author: Caolán McNamara Date: Mon Feb 17 09:52:33 2014 + Notes added by 'git notes add' diff --git a/9c/8dbca600bcb32f2d9888e1a15f7d415ac5526d b/9c/8dbca600bcb32f2d9888e1a15f7d415ac5526d new file mode 100644 index 000..403addb --- /dev/null +++ b/9c/8dbca600bcb32f2d9888e1a15f7d415ac5526d @@ -0,0 +1 @@ +ignore: OS/2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a0/4a229475a38600db57fdd40d97fa2e13283467
a0/4a229475a38600db57fdd40d97fa2e13283467 |1 + 1 file changed, 1 insertion(+) New commits: commit 88294f7ea5915ce92b58092f1f20f3eab00b0004 Author: Caolán McNamara Date: Mon Feb 17 09:52:53 2014 + Notes added by 'git notes add' diff --git a/a0/4a229475a38600db57fdd40d97fa2e13283467 b/a0/4a229475a38600db57fdd40d97fa2e13283467 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/a0/4a229475a38600db57fdd40d97fa2e13283467 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cppcanvas/source extensions/inc extensions/source extensions/uiconfig extensions/UIConfig_sbibliography.mk include/sal vcl/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 32 --
extensions/UIConfig_sbibliography.mk |4
extensions/inc/bibliography.hrc|2
extensions/source/bibliography/bib.hrc |1
extensions/source/bibliography/datman.cxx | 70 +-
extensions/source/bibliography/datman.hrc |5
extensions/source/bibliography/datman.src | 47
extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui | 110
++
include/sal/log-areas.dox |1
vcl/source/filter/wmf/enhwmf.cxx | 15 -
10 files changed, 137 insertions(+), 150 deletions(-)
New commits:
commit f03e95da68138a48ba2d4b6ab382b839577f0a1d
Author: Caolán McNamara
Date: Mon Feb 17 09:27:25 2014 +
convert biblio choose data source dialog to .ui
Change-Id: Ia94c417be95f5cd8c1d694a61c5004b0e8486416
diff --git a/extensions/UIConfig_sbibliography.mk
b/extensions/UIConfig_sbibliography.mk
index 1517d1d..717c1ae 100644
--- a/extensions/UIConfig_sbibliography.mk
+++ b/extensions/UIConfig_sbibliography.mk
@@ -13,4 +13,8 @@ $(eval $(call
gb_UIConfig_add_menubarfiles,modules/sbibliography,\
extensions/uiconfig/sbibliography/menubar/menubar \
))
+$(eval $(call gb_UIConfig_add_uifiles,modules/sbibliography,\
+ extensions/uiconfig/sbibliography/ui/choosedatasourcedialog \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
index a7b22b1..ec420e9 100644
--- a/extensions/inc/bibliography.hrc
+++ b/extensions/inc/bibliography.hrc
@@ -62,8 +62,6 @@
#define UID_BIB_FRAME_WINDOW
"EXTENSIONS_UID_BIB_FRAME_WINDOW"
#define HID_BIB_DB_GRIDCTRL
"EXTENSIONS_HID_BIB_DB_GRIDCTRL"
#define HID_DLG_MAPPING
"EXTENSIONS_HID_DLG_MAPPING"
-#define HID_DLG_DBCHANGE
"EXTENSIONS_HID_DLG_DBCHANGE"
-#define HID_SELECTION_TLB
"EXTENSIONS_HID_SELECTION_TLB"
#endif // EXTENSIONS_BIBLIOGRAPHY_HRC
diff --git a/extensions/source/bibliography/bib.hrc
b/extensions/source/bibliography/bib.hrc
index a464de7..7b2fd10 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -29,7 +29,6 @@
#define RID_BIB_DIALOG (RID_BIB_START)
#define RID_TP_GENERAL (RID_BIB_DIALOG)
#define RID_DLG_MAPPING (RID_BIB_DIALOG + 1)
-#define RID_DLG_DBCHANGE(RID_BIB_DIALOG + 2)
//Controls(100)
#define RID_BIB_CONTROLS(RID_BIB_START + 100)
diff --git a/extensions/source/bibliography/datman.cxx
b/extensions/source/bibliography/datman.cxx
index 0baaf88..49f0201 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -528,14 +528,8 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl)
class DBChangeDialog_Impl : public ModalDialog
{
-OKButtonaOKBT;
-CancelButtonaCancelBT;
-HelpButton aHelpBT;
-FixedLine aSelectionGB;
-SvTabListBoxaSelectionLB;
-HeaderBar aSelectionHB;
+ListBox*m_pSelectionLB;
DBChangeDialogConfig_Impl aConfig;
-OUStringaEntryST;
BibDataManager* pDatMan;
@@ -547,51 +541,33 @@ public:
OUString GetCurrentURL()const;
};
-DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan
) :
-ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ),
-aOKBT(this, BibResId( BT_OK )),
-aCancelBT(this, BibResId( BT_CANCEL )),
-aHelpBT(this, BibResId( BT_HELP )),
-aSelectionGB(this, BibResId( GB_SELECTION )),
-aSelectionLB(this, BibResId( LB_SELECTION )),
-aSelectionHB(this, BibResId( HB_SELECTION )),
-aEntryST(BIB_RESSTR(ST_ENTRY)),
+DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan
)
+: ModalDialog(pParent, "ChooseDataSourceDialog",
+"modules/sbibliography/ui/choosedatasourcedialog.ui")
+,
pDatMan(pMan)
{
-FreeResource();
-aSelectionLB.SetDoubleClickHdl( LINK(this, DBChangeDialog_Impl,
DoubleClickHdl));
-try
-{
-::Size aSize = aSelectionHB.GetSizePixel();
-long nTabs[2];
-nTabs[0] = 1;// Number of Tabs
-nTabs[1] = aSize.Width() / 4;
-
-aSelectionHB.SetStyle(aSelectionHB.GetStyle()|WB_STDHEADERBAR);
-aSelectionHB.InsertItem( 1, aEntryST, aSize.Width());
-aSelectionHB.SetSizePixel(aSelectionHB.CalcWindowSizePixel());
-aSelectionHB.Show();
+get(m_pSelectionLB, "treeview");
+m_pSelectionLB->set_height_request(m_pSelectionLB->GetTextHeight() * 6);
-aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL );
-aSelectionLB.SetStyle(aSelectionLB.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0809f1ac5cdb6f983d8618f6737337f8011b4908 Author: Caolán McNamara Date: Mon Feb 17 09:49:22 2014 + Updated core Project: help 26c50c746d85f1a0fd63246ccb5025f50c3200c9 diff --git a/helpcontent2 b/helpcontent2 index a8efc0b..26c50c7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a8efc0b9d4754b92e8e05309bbcdb335b74aad19 +Subproject commit 26c50c746d85f1a0fd63246ccb5025f50c3200c9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 26c50c746d85f1a0fd63246ccb5025f50c3200c9 Author: Caolán McNamara Date: Mon Feb 17 09:49:22 2014 + remove unused helpids Change-Id: I3f689f0c77378733169ab4257e48a0b79e4fb409 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 2e81019..f733e01 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1424,7 +1424,6 @@ HID_DLG_ADABAS_TRANSACTIONLOG,37282, HID_DLG_ADABAS_TRANSACTIONLOG_SIZE,37287, HID_DLG_ADABAS_USR,37276, HID_DLG_DATABASE_WIZARD,39148, -HID_DLG_DBCHANGE,34843, HID_DLG_ERROR,38842, HID_DLG_FILTER_SELECT,35842, HID_DLG_FLDEDT_ADDRESS,53061, @@ -3169,7 +3168,6 @@ HID_SEARCH_STARTOVER,38186, HID_SEARCH_TEXT,38178, HID_SEARCH_WILDCARD,38187, HID_SECTION_FTNENDNOTES_PAGE,53249, -HID_SELECTION_TLB,34844, HID_SELECTTABLES,59000, HID_SELECT_TEMPLATE,54848, HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION,54940, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit 61a0c9fcc966819a1d29ae98cd1c58e7d408d51b
Author: Tor Lillqvist
Date: Mon Feb 17 11:40:22 2014 +0200
Need libdeployment.a
Change-Id: I7f9afa17f47199c3ba1bac4c3005893fb8ee4df9
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 4106322..8d9cbeb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -22,6 +22,7 @@ core_factory_list = [
("libstocserviceslo.a", "stocservices_component_getFactory"),
("libcomphelper.a", "comphelp_component_getFactory"),
("libconfigmgrlo.a", "configmgr_component_getFactory"),
+("libdeployment.a", "deployment_component_getFactory"),
("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
("libfsstoragelo.a", "fsstorage_component_getFactory"),
("libhyphenlo.a", "hyphen_component_getFactory"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: FOSDEM travel and hotel refund
Hi all, Please send your travel and hotel refund as explained bellow, we would like to group the requests. Thanks! Cheers Sophie Message original Sujet: FOSDEM travel and hotel refund Date : Fri, 07 Feb 2014 11:44:18 +0100 De : Sophie Pour : proje...@global.libreoffice.org, libreoffice-dev , libreoffice-ux-adv...@lists.freedesktop.org Hi all, To all FOSDEM participants, please send you travel and hotel refund requests during next week so we can start refundings and group them. You need to send : - your hotel invoice - your travel invoice - the SPI form available here https://wiki.documentfoundation.org/TDF/Policies/Refunding Send all this to treasu...@documentfoundation.org The link above will also give you the detailed rules. Thanks in advance! Kind regards Sophie -- Sophie Gautier Tel:+33683901545 Membership & Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: scripts/gerrit-filter-domain
scripts/gerrit-filter-domain | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit bfdcbaadd632a94e30064e7b8bdec8ab9b38b94f Author: Miklos Vajna Date: Mon Feb 17 10:28:53 2014 +0100 gerrit-filter-domain: skip one change only once Change-Id: I3fde3477e5df65ac9ab379a80ef27b48089c4d59 diff --git a/scripts/gerrit-filter-domain b/scripts/gerrit-filter-domain index 8ff7d6c..9f353c3 100755 --- a/scripts/gerrit-filter-domain +++ b/scripts/gerrit-filter-domain @@ -57,11 +57,12 @@ def main(argv): break if skip: break -for j in i['patchSets'][-1]['approvals']: -if j['value'] == "-1": -skippedChanges.append((i, "-1 review")) -skip = True -break +if not skip: +for j in i['patchSets'][-1]['approvals']: +if j['value'] == "-1": +skippedChanges.append((i, "-1 review")) +skip = True +break except: pass if skip: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4
writerfilter/source/dmapper/DomainMapper.cxx | 12 ++--
writerfilter/source/dmapper/SettingsTable.cxx | 11 +++
writerfilter/source/dmapper/SettingsTable.hxx |3 +++
writerfilter/source/ooxml/model.xml |2 +-
5 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 8b6ff51bb89db0d7050bb4d00c0ec797b4754f25
Author: Miklos Vajna
Date: Mon Feb 17 10:00:32 2014 +0100
fdo#74357 DOCX import: avoid layout problem with automatic spacing
Commit 279ff2e03371542d014bf281e73282ba8080cf6b (bnc#816593 DOCX import:
fix auto para spacing without compat option, 2013-08-28) corrected the
value of "auto" paragraph spacing, but unfortunately this triggers a
layout problem:
warn:legacy.osl:12692:1:sw/source/core/layout/tabfrm.cxx:2513: debug
assertion: - format of table lowers suppressed by fix
i44910
resulting in "the rest of the table is not rendered by the layout".
Given that we backported the original fix to stable branches as well,
just stay on the safe side and revert back to the original behavior in
case the document requests the web layout.
Change-Id: I72683530b5218beff084bec8218cc99946b44802
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 41089c9..7d9e4f5 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -752,6 +752,10 @@ DECLARE_OOXMLIMPORT_TEST(testFdo74357, "fdo74357.docx")
uno::Reference
xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
// This was 0.
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+
+// Bottom margin of the first paragraph was too large, causing a layout
problem.
+// This was 494.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(86),
getProperty(getParagraph(1), "ParaBottomMargin"));
}
DECLARE_OOXMLIMPORT_TEST(testFdo55187, "fdo55187.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c403675..b3932c3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -549,7 +549,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
sal_Int32 default_spacing = 100;
if
(!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
{
-default_spacing = 280;
+// 49 is just the old value that should be removed, once the
+// root cause in SwTabFrm::MakeAll() is fixed.
+if (m_pImpl->GetSettingsTable()->GetView() ==
NS_ooxml::LN_Value_wordprocessingml_ST_View_web)
+default_spacing = 49;
+else
+default_spacing = 280;
}
m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN,
uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
if (nIntValue) // If auto spacing is set, then only store set
value in InteropGrabBag
@@ -564,7 +569,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
if
(!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
{
-default_spacing = 280;
+if (m_pImpl->GetSettingsTable()->GetView() ==
NS_ooxml::LN_Value_wordprocessingml_ST_View_web)
+default_spacing = 49;
+else
+default_spacing = 280;
}
m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN,
uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
if (nIntValue) // If auto spacing is set, then only store set
value in InteropGrabBag
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx
b/writerfilter/source/dmapper/SettingsTable.cxx
index d6ef721..f2c9023 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -66,6 +66,7 @@ struct SettingsTable_Impl
OUString m_sSalt;
boolm_bLinkStyles;
sal_Int16 m_nZoomFactor;
+Id m_nView;
boolm_bEvenAndOddHeaders;
boolm_bUsePrinterMetrics;
boolembedTrueTypeFonts;
@@ -92,6 +93,7 @@ struct SettingsTable_Impl
, m_nCryptSpinCount(0)
, m_bLinkStyles(false)
, m_nZoomFactor(0)
+, m_nView(0)
, m_bEvenAndOddHeaders(false)
, m_bUsePrinterMetrics(false)
, embedTrueTypeFonts(false)
@@ -139,6 +141,9 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
m_pImpl->m_pThemeFontLangProps[2].Name = "bidi";
m_pImpl->m_pThemeFontLangProps[2].Value <<= sStringValue;
break;
+case NS_ooxml::LN_CT_View_val:
+m_pImpl->m_nView = nIntValue;
+break;
default:
{
#ifdef DE
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo74357.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |5 -
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit e5fd7c2dacf3c128cdc62622e736ce8abbc578a5
Author: Miklos Vajna
Date: Mon Feb 17 09:37:51 2014 +0100
fdo#74357 DOCX import: fix nested tables anchored inside tables
Regression from bbef85c157169efa958ea1014d91d467cb243e6f (bnc#779620
DOCX import: try harder to convert floating tables to text frames,
2013-10-01), the conversion of nested tables is delayed by default till
we know the page size. However, in case the anchor is in a table, we
should convert it right away, because the conversion of the parent table
would invalidate our XTextRange references.
Change-Id: Id41556e721c6e1c7239e4ea25abd57c999d2219b
diff --git a/sw/qa/extras/ooxmlimport/data/fdo74357.docx
b/sw/qa/extras/ooxmlimport/data/fdo74357.docx
new file mode 100644
index 000..9703729
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo74357.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index fb2904a..41089c9 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -745,6 +745,15 @@ DECLARE_OOXMLIMPORT_TEST(testN779627, "n779627.docx")
CPPUNIT_ASSERT_EQUAL_MESSAGE("Not centered vertically relatively to page",
text::RelOrientation::PAGE_FRAME, nValue);
}
+DECLARE_OOXMLIMPORT_TEST(testFdo74357, "fdo74357.docx")
+{
+// Floating table wasn't converted to a textframe.
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+// This was 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo55187, "fdo55187.docx")
{
// 0x010d was imported as a newline.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3bc66fa..ecacbcd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -959,9 +959,12 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
// SectionPropertyMap::CloseSectionGroup(), so we'll have no idea
// about the text area width, nor can fix this by delaying the text
// frame conversion: just do it here.
+// Also, we the anchor is within a table, then do it here as well,
+// as xStart/xEnd would not point to the start/end at conversion
+// time anyway.
sal_Int32 nTableWidth = 0;
m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH,
nTableWidth);
-if (m_rDMapper_Impl.GetSectionContext())
+if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1)
m_rDMapper_Impl.m_aPendingFloatingTables.push_back(FloatingTableInfo(xStart,
xEnd, aFrameProperties, nTableWidth));
else
m_xText->convertToTextFrame(xStart, xEnd, aFrameProperties);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/headless/svpgdi.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4a153b4d4429480d04d3b347669723753c05e267
Author: Tor Lillqvist
Date: Mon Feb 17 09:55:24 2014 +0200
Fix fallout from 772c3a202481506b92c496948cfdc0f23ab94b2c
Change-Id: I0019ca081086544142b39aac5e6f00d5f1822ccb
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 1e76503..94a5c1c 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -244,7 +244,7 @@ public:
std::vector& rBuffer,
bool* pJustCFF );
voidRefreshRect( const CGRect& ) { };
-voidRefreshRect(float /* lX */, float /* lY */, float /*
lWidth */, float /* lHeight */) { };
+voidRefreshRect(float lX, float lY, float lWidth, float
lHeight);
voidSetState();
voidUnsetState();
voidInvalidateContext();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
