[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - cui/source svx/source
cui/source/tabpages/tpline.cxx |2 ++
svx/source/sidebar/nbdtmg.cxx | 14 --
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |4
svx/source/xoutdev/xattr2.cxx |4
4 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit d9f2a2f5cd4e33610d3ce7335f034b861f55ca79
Author: Pavel JanÃk pavelja...@apache.org
Date: Fri May 17 05:59:14 2013 +
Remove unused variables to prevent compiler warnings.
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 28c7a9b..a1bf73b 100755
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -386,7 +386,6 @@ sal_uInt16
BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16 mLe
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
sal_Unicode cChar = aFmt.GetBulletChar();
-const Font* pFont = aFmt.GetBulletFont();
//sal_uInt16 nLength = 0;
/*if( Application::GetSettings().GetLayoutRTL() )
{
@@ -676,7 +675,6 @@ sal_uInt16
GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uI
if ( pGrf )
{
-const String* pGrfName = pBrsh-GetGraphicLink();
Graphic aGraphic;
for(sal_uInt16 i=0;iaGrfDataLst.Count();i++)
{
@@ -1054,8 +1052,6 @@ sal_uInt16
MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16
if ( pGrf )
{
-const String* pGrfName = pBrsh-GetGraphicLink();
-//String* pGrfName = (String*)(pBrsh-GetGraphicLink());
for(sal_uInt16 i = nFromIndex; i DEFAULT_BULLET_TYPES; i++)
{
if ( pActualBullets[i]-eType == eNBType::GRAPHICBULLETS )
@@ -1537,8 +1533,6 @@ sal_uInt16
NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16 m
return (sal_uInt16)0x;
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
-sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
-sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
String sPreFix = aFmt.GetPrefix();
String sSuffix = aFmt.GetSuffix();
String sEmpty;
@@ -1798,12 +1792,8 @@ sal_uInt16
OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16 mLe
{
NumSettings_ImplPtr _pSet =
pItemArr-pNumSettingsArr-GetObject(iLevel);
sal_Int16 eNType = _pSet-nNumberType;
-const sal_Unicode cLocalPrefix = _pSet-sPrefix.getLength() ?
_pSet-sPrefix.getStr()[0] : 0;
-const sal_Unicode cLocalSuffix = _pSet-sSuffix.getLength() ?
_pSet-sSuffix.getStr()[0] : 0;
SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
-sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
-sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
String sPreFix = aFmt.GetPrefix();
String sSuffix = aFmt.GetSuffix();
String sEmpty;
@@ -1811,7 +1801,6 @@ sal_uInt16
OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16 mLe
if( eNumType == SVX_NUM_CHAR_SPECIAL)
{
sal_Unicode cChar = aFmt.GetBulletChar();
-const Font* pFont = aFmt.GetBulletFont();
sal_Unicode ccChar = _pSet-sBulletChar.getStr()[0];
rtl::OUString sFont = _pSet-sBulletFont;
if ( !((cChar == ccChar) //pFont
sFont.compareTo(pFont-GetName())
@@ -1881,8 +1870,6 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule
aNum,sal_uInt16 nIndex,sal_
for (sal_uInt16 iLevel=0;iLevel nCount;iLevel++)
{
SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
-sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
-sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
sal_Int16 eNumType = aFmt.GetNumberingType();
NumSettings_ImplPtr _pSet =
pItemArr-pNumSettingsArr-GetObject(iLevel);
@@ -1958,7 +1945,6 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule
aNum,sal_uInt16 nIndex,sal_uIn
NumSettings_ImplPtr pLevelSettings = 0;
String sBulletCharFmtName = GetBulCharFmtName();
-sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i aNum.GetLevelCount(); i++)
{
if(pNumSettingsArr-Count() i)
commit 827fdf8263184e0ed99ede6bf36ae141a4e79b21
Author: Pavel JanÃk pavelja...@apache.org
Date: Fri May 17 05:33:54 2013 +
Add default cases to prevent compiler warnings.
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 349a62f..d54d8bc 100755
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -392,6 +392,8 @@ void ParaLineSpacingControl::Rearrange(SfxItemState
currSPState,FieldUnit currMe
mbUseLineSPCustom = USE_CUSTOM;
anybody know about the com::sun::star::awt::ExtToolkit service
Hi There is a service called com.sun.star.awt.ExtToolkit which is still being referenced in a couple of places in the code. But I cannot find any sign of anything implementing this service in the LO code. Can I convert this to use the Toolkit service? The places where it is being used, it casts the service to XToolkit. Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/undo/undotab.cxx |1 + sc/source/ui/view/viewfun2.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 6e6b9e4511baf189ce4e65c787765fd685ba2288 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed May 15 12:59:23 2013 +0300 fix for fdo#53031 Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 Reviewed-on: https://gerrit.libreoffice.org/3914 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr (cherry picked from commit 08662568a590bfb20849fce077d8b5aff8b99b57) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 9732e21..54ea512 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -356,6 +356,7 @@ void ScUndoDeleteTab::Undo() pDoc-SetVisible( nTab, pRefUndoDoc-IsVisible( nTab ) ); pDoc-SetTabBgColor( nTab, pRefUndoDoc-GetTabBgColor(nTab) ); pDoc-SetSheetEvents( nTab, pRefUndoDoc-GetSheetEvents( nTab ) ); +pDoc-SetLayoutRTL( nTab, pRefUndoDoc-IsLayoutRTL( nTab ) ); if ( pRefUndoDoc-IsTabProtected( nTab ) ) pDoc-SetTabProtection(nTab, pRefUndoDoc-GetTabProtection(nTab)); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 2dd4871..590e134 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2144,6 +2144,7 @@ sal_Bool ScViewFunc::DeleteTables(const vectorSCTAB TheTabs, sal_Bool bRecord pUndoDoc-SetVisible( nTab, pDoc-IsVisible( nTab ) ); pUndoDoc-SetTabBgColor( nTab, pDoc-GetTabBgColor(nTab) ); pUndoDoc-SetSheetEvents( nTab, pDoc-GetSheetEvents( nTab ) ); +pUndoDoc-SetLayoutRTL( nTab, pDoc-IsLayoutRTL( nTab ) ); if ( pDoc-IsTabProtected( nTab ) ) pUndoDoc-SetTabProtection(nTab, pDoc-GetTabProtection(nTab)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svtools/inc svtools/source
svtools/inc/svtools/parhtml.hxx |2 ++
svtools/source/svhtml/parhtml.cxx | 22 ++
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 2d4e570f9d6e6464cf597a1a90e84ccb3b232b5a
Author: Eike Rathke er...@redhat.com
Date: Thu May 16 23:53:30 2013 +0200
resolved fdo#56772 keep track of HTML ON/OFF tokens
Regression introduced with 11cbcb8b08b540b144a5df744e9fba0b6ba8144a
followed by 56d6589368c2e88cffec0c2e518f7c90863eeae6
Deep from svtools/source/svhtml/parhtml.cxx HTMLParser::_GetNextToken()
only a HTML_TABLEDATA_OFF was generated for td .../ without a matching
HTML_TABLEDATA_ON (actually same for all XXX/ ON/OFF tokens). This
confuses a state machine that doesn't keep track of such unexpected
closures and also expects all attributes of an element at an ON token.
Only the parser knows this is actually one token but needs to generate
separate ON/OFF tokens.
These bugs mentioned in the original code and commits are still fixed
with this change:
https://bugs.freedesktop.org/show_bug.cgi?id=34666
https://bugs.freedesktop.org/show_bug.cgi?id=36080
https://bugs.freedesktop.org/show_bug.cgi?id=36390
Change-Id: I2b3190d297a35ee3dfda95f9a4841f7c53ed4a92
(cherry picked from commit bb7360ca9929e9b395b3c903f460c9ed5efdce4d)
Reviewed-on: https://gerrit.libreoffice.org/3925
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index f8c0c61..fdfeeab 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.hxx
@@ -144,6 +144,8 @@ private:
sal_uInt32 nPre_LinePos;// Pos in der Line im PRE-Tag
+int mnPendingOffToken; /// OFF token pending for a XX.../
ON/OFF ON token
+
String aEndToken;
protected:
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index 68232e5..91bae59 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -297,7 +297,8 @@ HTMLParser::HTMLParser( SvStream rIn, bool bReadNewDoc ) :
bEndTokenFound(false),
bPre_IgnoreNewPara(false),
bReadNextChar(false),
-bReadComment(false)
+bReadComment(false),
+mnPendingOffToken(0)
{
//#i76649, default to UTF-8 for HTML unless we know differently
SetSrcEncoding(RTL_TEXTENCODING_UTF8);
@@ -1057,6 +1058,15 @@ int HTMLParser::_GetNextToken()
int nRet = 0;
sSaveToken.Erase();
+if (mnPendingOffToken)
+{
+// HTML_TOKEN_OFF generated for HTML_TOKEN_ON
+nRet = mnPendingOffToken;
+mnPendingOffToken = 0;
+aToken.Erase();
+return nRet;
+}
+
// Delete options
if (!maOptions.empty())
maOptions.clear();
@@ -1204,10 +1214,14 @@ int HTMLParser::_GetNextToken()
ScanText( '' );
// fdo#34666 fdo#36080 fdo#36390: closing /?:
-// return HTML_TOKEN_OFF instead of HTML_TOKEN_ON
+// generate pending HTML_TOKEN_OFF for
HTML_TOKEN_ON
+// Do not convert this to a single HTML_TOKEN_OFF
+// which lead to fdo#56772.
if ((HTML_TOKEN_ONOFF nRet) (aToken.Len() = 1)
-('/' == aToken.GetChar(aToken.Len()-1))) {
-++nRet; // HTML_TOKEN_ON - HTML_TOKEN_OFF;
+('/' == aToken.GetChar(aToken.Len()-1)))
+{
+mnPendingOffToken = nRet + 1; //
HTML_TOKEN_ON - HTML_TOKEN_OFF
+aToken.Erase( aToken.Len()-1, 1); // remove
trailing '/'
}
if( sal_Unicode(EOF) == nNextCh rInput.IsEof() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svtools/inc svtools/source
svtools/inc/svtools/parhtml.hxx |2 ++
svtools/source/svhtml/parhtml.cxx | 22 ++
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 9cedf500f2299022641bb774549a6600e1af43d1
Author: Eike Rathke er...@redhat.com
Date: Thu May 16 23:53:30 2013 +0200
resolved fdo#56772 keep track of HTML ON/OFF tokens
Regression introduced with 11cbcb8b08b540b144a5df744e9fba0b6ba8144a
followed by 56d6589368c2e88cffec0c2e518f7c90863eeae6
Deep from svtools/source/svhtml/parhtml.cxx HTMLParser::_GetNextToken()
only a HTML_TABLEDATA_OFF was generated for td .../ without a matching
HTML_TABLEDATA_ON (actually same for all XXX/ ON/OFF tokens). This
confuses a state machine that doesn't keep track of such unexpected
closures and also expects all attributes of an element at an ON token.
Only the parser knows this is actually one token but needs to generate
separate ON/OFF tokens.
These bugs mentioned in the original code and commits are still fixed
with this change:
https://bugs.freedesktop.org/show_bug.cgi?id=34666
https://bugs.freedesktop.org/show_bug.cgi?id=36080
https://bugs.freedesktop.org/show_bug.cgi?id=36390
Change-Id: I2b3190d297a35ee3dfda95f9a4841f7c53ed4a92
(cherry picked from commit bb7360ca9929e9b395b3c903f460c9ed5efdce4d)
Reviewed-on: https://gerrit.libreoffice.org/3926
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index ad228f5..4ab2bff 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.hxx
@@ -153,6 +153,8 @@ private:
sal_uInt32 nPre_LinePos;// Pos in der Line im PRE-Tag
+int mnPendingOffToken; /// OFF token pending for a XX.../
ON/OFF ON token
+
String aEndToken;
protected:
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index 3011833..5247979 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -308,7 +308,8 @@ HTMLParser::HTMLParser( SvStream rIn, bool bReadNewDoc ) :
bEndTokenFound(false),
bPre_IgnoreNewPara(false),
bReadNextChar(false),
-bReadComment(false)
+bReadComment(false),
+mnPendingOffToken(0)
{
//#i76649, default to UTF-8 for HTML unless we know differently
SetSrcEncoding(RTL_TEXTENCODING_UTF8);
@@ -1070,6 +1071,15 @@ int HTMLParser::_GetNextToken()
int nRet = 0;
sSaveToken.Erase();
+if (mnPendingOffToken)
+{
+// HTML_TOKEN_OFF generated for HTML_TOKEN_ON
+nRet = mnPendingOffToken;
+mnPendingOffToken = 0;
+aToken.Erase();
+return nRet;
+}
+
// Delete options
if (!maOptions.empty())
maOptions.clear();
@@ -1217,10 +1227,14 @@ int HTMLParser::_GetNextToken()
ScanText( '' );
// fdo#34666 fdo#36080 fdo#36390: closing /?:
-// return HTML_TOKEN_OFF instead of HTML_TOKEN_ON
+// generate pending HTML_TOKEN_OFF for
HTML_TOKEN_ON
+// Do not convert this to a single HTML_TOKEN_OFF
+// which lead to fdo#56772.
if ((HTML_TOKEN_ONOFF nRet) (aToken.Len() = 1)
-('/' == aToken.GetChar(aToken.Len()-1))) {
-++nRet; // HTML_TOKEN_ON - HTML_TOKEN_OFF;
+('/' == aToken.GetChar(aToken.Len()-1)))
+{
+mnPendingOffToken = nRet + 1; //
HTML_TOKEN_ON - HTML_TOKEN_OFF
+aToken.Erase( aToken.Len()-1, 1); // remove
trailing '/'
}
if( sal_Unicode(EOF) == nNextCh rInput.IsEof() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] resolved fdo#56772 keep track of HTML ON/OFF tokens
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3925 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3925 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b3190d297a35ee3dfda95f9a4841f7c53ed4a92 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] resolved fdo#56772 keep track of HTML ON/OFF tokens
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3926 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3926 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b3190d297a35ee3dfda95f9a4841f7c53ed4a92 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sw/inc sw/source
sw/inc/crsrsh.hxx |1 +
sw/source/core/crsr/crsrsh.cxx | 17 +
sw/source/ui/wrtsh/delete.cxx | 23 ++-
3 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit b4aeed3b8dc402d72ae9a8b928babc228e2ead7a
Author: Michael Stahl mst...@redhat.com
Date: Fri May 17 00:09:39 2013 +0200
fdo#60967: re-enable deletion of paragraph following table
This was actually a documented feature, so removing it just because it
only happened to work sometimes by accident was a bad idea :)
(regression from f4b6c94c68b5f67b931cde8d0acda6ec8b288bb)
So implement this in a less accidental way, so that Ctrl+Shift+Del
at the last position inside a table will delete the following paragraph.
Do not implement the weird only delete first sentence and merge rest of
paragraph into cell behavior, because i don't think it makes sense;
much better to just delete the whole paragraph, that is also the most
likely use-case for this (with table in frame/header/footer).
(cherry picked from commit 38b06c661559e6eca60e2c4a4a3637b8293307b2)
Conflicts:
sw/inc/crsrsh.hxx
Change-Id: Ia88b3c8958798fd9c64ee75b56c61d787079133e
Reviewed-on: https://gerrit.libreoffice.org/3927
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index fa2b287..650493f 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -732,6 +732,7 @@ public:
sal_Bool IsEndSentence() const;
sal_Bool IsSttPara() const;
sal_Bool IsEndPara() const;
+bool IsEndOfTable() const; /// at the very last SwPosition inside a table
sal_Bool IsStartOfDoc() const;
sal_Bool IsEndOfDoc() const;
sal_Bool IsInFrontOfLabel() const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1493d14..01ee5c9 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1024,6 +1024,23 @@ sal_Bool SwCrsrShell::IsSttPara() const
sal_Bool SwCrsrShell::IsEndPara() const
{ return( pCurCrsr-GetPoint()-nContent == pCurCrsr-GetCntntNode()-Len()
? sal_True : sal_False ); }
+bool SwCrsrShell::IsEndOfTable() const
+{
+if (IsTableMode() || IsBlockMode() || !IsEndPara())
+{
+return false;
+}
+SwTableNode const*const pTableNode( IsCrsrInTbl() );
+if (!pTableNode)
+{
+return false;
+}
+SwEndNode const*const pEndTableNode(pTableNode-EndOfSectionNode());
+SwNodeIndex const lastNode(*pEndTableNode, -2);
+SAL_WARN_IF(!lastNode.GetNode().GetTxtNode(), sw.core,
+text node expected);
+return (lastNode == pCurCrsr-GetPoint()-nNode);
+}
sal_Bool SwCrsrShell::IsInFrontOfLabel() const
{
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index c323229..a3a03d4 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -480,7 +480,28 @@ long SwWrtShell::DelToEndOfSentence()
if(IsEndOfDoc())
return 0;
OpenMark();
-long nRet = _FwdSentence() ? Delete() : 0;
+long nRet(0);
+// fdo#60967: special case that is documented in help: delete
+// paragraph following table if cursor is at end of last cell in table
+if (IsEndOfTable())
+{
+Push();
+ClearMark();
+if (SwCrsrShell::Right(1,CRSR_SKIP_CHARS))
+{
+SetMark();
+SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
+if (!IsEndOfDoc()) // do not delete last paragraph in body text
+{
+nRet = DelFullPara() ? 1 : 0;
+}
+}
+Pop(false);
+}
+else
+{
+nRet = _FwdSentence() ? Delete() : 0;
+}
CloseMark( 0 != nRet );
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/crsrsh.hxx |1 +
sw/source/core/crsr/crsrsh.cxx | 17 +
sw/source/ui/wrtsh/delete.cxx | 23 ++-
3 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit eebd5646baa7075b486563b84a2fad97c829fb2c
Author: Michael Stahl mst...@redhat.com
Date: Fri May 17 00:09:39 2013 +0200
fdo#60967: re-enable deletion of paragraph following table
This was actually a documented feature, so removing it just because it
only happened to work sometimes by accident was a bad idea :)
(regression from f4b6c94c68b5f67b931cde8d0acda6ec8b288bb)
So implement this in a less accidental way, so that Ctrl+Shift+Del
at the last position inside a table will delete the following paragraph.
Do not implement the weird only delete first sentence and merge rest of
paragraph into cell behavior, because i don't think it makes sense;
much better to just delete the whole paragraph, that is also the most
likely use-case for this (with table in frame/header/footer).
Change-Id: Ia88b3c8958798fd9c64ee75b56c61d787079133e
(cherry picked from commit 38b06c661559e6eca60e2c4a4a3637b8293307b2)
Reviewed-on: https://gerrit.libreoffice.org/3928
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 5a061db..5b6f741 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -721,6 +721,7 @@ public:
sal_Bool IsEndSentence() const;
bool IsSttPara() const;
bool IsEndPara() const;
+bool IsEndOfTable() const; /// at the very last SwPosition inside a table
sal_Bool IsStartOfDoc() const;
sal_Bool IsEndOfDoc() const;
bool IsInFrontOfLabel() const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index ac00ff7..819fb16 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -987,6 +987,23 @@ bool SwCrsrShell::IsSttPara() const
bool SwCrsrShell::IsEndPara() const
{ return pCurCrsr-GetPoint()-nContent == pCurCrsr-GetCntntNode()-Len(); }
+bool SwCrsrShell::IsEndOfTable() const
+{
+if (IsTableMode() || IsBlockMode() || !IsEndPara())
+{
+return false;
+}
+SwTableNode const*const pTableNode( IsCrsrInTbl() );
+if (!pTableNode)
+{
+return false;
+}
+SwEndNode const*const pEndTableNode(pTableNode-EndOfSectionNode());
+SwNodeIndex const lastNode(*pEndTableNode, -2);
+SAL_WARN_IF(!lastNode.GetNode().GetTxtNode(), sw.core,
+text node expected);
+return (lastNode == pCurCrsr-GetPoint()-nNode);
+}
bool SwCrsrShell::IsInFrontOfLabel() const
{
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index f714f6a..0c23dab 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -469,7 +469,28 @@ long SwWrtShell::DelToEndOfSentence()
if(IsEndOfDoc())
return 0;
OpenMark();
-long nRet = _FwdSentence() ? Delete() : 0;
+long nRet(0);
+// fdo#60967: special case that is documented in help: delete
+// paragraph following table if cursor is at end of last cell in table
+if (IsEndOfTable())
+{
+Push();
+ClearMark();
+if (SwCrsrShell::Right(1,CRSR_SKIP_CHARS))
+{
+SetMark();
+SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
+if (!IsEndOfDoc()) // do not delete last paragraph in body text
+{
+nRet = DelFullPara() ? 1 : 0;
+}
+}
+Pop(false);
+}
+else
+{
+nRet = _FwdSentence() ? Delete() : 0;
+}
CloseMark( 0 != nRet );
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-3-6] fdo#60967: re-enable deletion of paragraph following table
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3927 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3927 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia88b3c8958798fd9c64ee75b56c61d787079133e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ 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 58978, which changed state. Bug 58978 Summary: FILEOPEN and FILESAVE causes General Error for .odt https://bugs.freedesktop.org/show_bug.cgi?id=58978 What|Removed |Added Status|REOPENED|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
[Libreoffice-commits] core.git: Changes to 'feature/sidebaropt'
New branch 'feature/sidebaropt' available with the following commits: commit 947c2645bec8c3e4458314da451d1e85c550ab83 Author: Michael Meeks michael.me...@suse.com Date: Thu May 16 21:00:49 2013 +0100 More restoration re-enablement of the task pane. commit dc4dd9a48f0ac3c377150e30badc7e2e27ae50fc Author: Michael Meeks michael.me...@suse.com Date: Thu May 16 20:54:42 2013 +0100 more reversions ... commit 8a152e42a2ff6f8dd5a5a0f453f7ef575e2c1a04 Author: Michael Meeks michael.me...@suse.com Date: Thu May 16 20:36:08 2013 +0100 more work partial reverting - to squash back in ... commit 805f8aae2a89bcec3c3d03f693c21788b1cf3aba Author: Michael Meeks michael.me...@suse.com Date: Thu May 16 17:11:24 2013 +0100 revert toolpanel removal: squash me into the initial commit [!] ... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/sidebar/nbdtmg.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit ebc280815ce15efd3782bf2962e8fea1fd81a931
Author: Pavel JanÃk pavelja...@apache.org
Date: Fri May 17 08:04:41 2013 +
Unname unused arguments to prevent compiler warnings.
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index a1bf73b..75a3451 100755
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -478,7 +478,7 @@ sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule
aNum,sal_uInt16 nIndex,sal_
return sal_True;
}
-sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel,sal_Bool isDefault,sal_Bool isResetSize)
+sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel,sal_Bool /* isDefault */,sal_Bool isResetSize)
{
//if ( mLevel == (sal_uInt16)0x )
// return sal_False;
@@ -529,7 +529,7 @@ sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule
aNum,sal_uInt16 nIndex,sal_uIn
return sal_True;
}
-String BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
+String BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /* isDefault
*/)
{
String sRet;
//sal_uInt16 nLength = 0;
@@ -657,7 +657,7 @@ void GraphyicBulletsTypeMgr::Init()
aGrfDataLst.Insert( pEntry, LIST_APPEND );
}
}
-sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule
aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex)
+sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule
aNum,sal_uInt16 mLevel,sal_uInt16 /* nFromIndex */)
{
if ( mLevel == (sal_uInt16)0x || mLevel == 0)
return (sal_uInt16)0x;
@@ -741,7 +741,7 @@ sal_Bool
GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule aNum,sal_uInt16 nIn
return sal_True;
}
-sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel,sal_Bool isDefault,sal_Bool isResetSize)
+sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel,sal_Bool /* isDefault */,sal_Bool /* isResetSize */)
{
//if ( mLevel == (sal_uInt16)0x )
// return sal_False;
@@ -786,7 +786,7 @@ sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule
aNum,sal_uInt16 nIndex
return sal_True;
}
-String GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool
isDefault)
+String GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*
isDefault */)
{
String sRet;
sal_uInt16 nLength = 0;
@@ -1780,7 +1780,7 @@ void OutlineTypeMgr::Init()
}
}
-sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex)
+sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16
/* mLevel */,sal_uInt16 nFromIndex)
{
sal_uInt16 nLength =
sizeof(pOutlineSettingsArrs)/sizeof(OutlineSettings_Impl*);
for(sal_uInt16 iDex = nFromIndex; iDex nLength; iDex++)
@@ -1926,7 +1926,7 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule
aNum,sal_uInt16 nIndex,sal_
return sal_True;
}
-sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel,sal_Bool isDefault,sal_Bool isResetSize)
+sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 /* mLevel */,sal_Bool isDefault,sal_Bool isResetSize)
{
//if ( mLevel == (sal_uInt16)0x )
// return sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - cui/source vcl/source
cui/source/dialogs/about.cxx | 49 ---
vcl/source/app/brand.cxx | 22 +--
2 files changed, 47 insertions(+), 24 deletions(-)
New commits:
commit 996206f18cc8e93d9497765c899710c1f64636df
Author: Petr Mladek pmla...@suse.cz
Date: Thu May 16 18:58:22 2013 +0200
look for alternative about dialog branding again
Some customers use its own branding in the program/edition
subdirectory. This feature has been removed when fixing
the rebased SVG import stuff.
Change-Id: I78a32513008918928e948aff5d6653f24b401ec7
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index f7332b9..b70754f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -191,25 +191,11 @@ void AboutDialog::StyleControls()
aCancelButton.GrabFocus();
}
-static bool loadBrandSvg(const char *pName, BitmapEx rBitmap, int nWidth )
+static bool tryLoadBrandSvg(const OUString rPath, BitmapEx rBitmap, int
nWidth )
{
// Load from disk
// -
-rtl::OUString aBaseName = ( rtl::OUString(/) +
-rtl::OUString::createFromAscii( pName ) );
-rtl::OUString aSvg( .svg );
-
-rtl_Locale *pLoc = NULL;
-osl_getProcessLocale (pLoc);
-LanguageTag aLanguageTag( *pLoc);
-
-rtl::OUString aName = aBaseName + aSvg;
-rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(-) +
- aLanguageTag.getBcp47() +
- aSvg );
-rtl::OUString uri = rtl::OUString::createFromAscii(
$BRAND_BASE_DIR/program ) + aBaseName+aSvg;
-rtl::Bootstrap::expandMacros( uri );
-INetURLObject aObj( uri );
+INetURLObject aObj( rPath );
SvgData aSvgData(aObj.PathToFileName());
// transform into [0,0,width,width*aspect] std dimensions
@@ -264,7 +250,7 @@ static bool loadBrandSvg(const char *pName, BitmapEx
rBitmap, int nWidth )
if(xIntBmp.is())
{
rBitmap = vcl::unotools::bitmapExFromXBitmap(xIntBmp);
-return true;
+return !rBitmap.IsEmpty();
}
}
}
@@ -276,6 +262,35 @@ static bool loadBrandSvg(const char *pName, BitmapEx
rBitmap, int nWidth )
return false;
}
+static bool tryLoadEditionBrandSvg(const OUString rBaseDir, const OUString
rName, BitmapEx rBitmap, int nWidth )
+{
+return
+tryLoadBrandSvg( rBaseDir + /program/edition + rName, rBitmap,
nWidth) ||
+tryLoadBrandSvg( rBaseDir + /program + rName, rBitmap, nWidth);
+}
+
+static bool loadBrandSvg(const char *pName, BitmapEx rBitmap, int nWidth )
+{
+rtl::OUString aBaseDir( $BRAND_BASE_DIR);
+rtl::Bootstrap::expandMacros( aBaseDir );
+rtl::OUString aBaseName( / + rtl::OUString::createFromAscii( pName ) );
+rtl::OUString aSvg( .svg );
+
+rtl_Locale *pLoc = NULL;
+osl_getProcessLocale (pLoc);
+LanguageTag aLanguageTag( *pLoc);
+
+rtl::OUString aName = aBaseName + aSvg;
+rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(-) +
+ aLanguageTag.getBcp47() +
+ aSvg );
+
+return
+tryLoadEditionBrandSvg( aBaseDir, aLocaleName, rBitmap, nWidth) ||
+tryLoadEditionBrandSvg( aBaseDir, aName, rBitmap, nWidth);
+}
+
+
void AboutDialog::LayoutControls()
{
// Get the size of the screen
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 03e999a..e508310 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -41,6 +41,16 @@ namespace {
else
return false;
}
+
+static bool loadSvg(const char *pPath, const rtl::OUString rName,
BitmapEx rBitmap)
+{
+rtl::OUString uri = rtl::OUString::createFromAscii( pPath ) + rName;
+rtl::Bootstrap::expandMacros( uri );
+INetURLObject aObj( uri );
+SvgData aSvgData(aObj.PathToFileName());
+rBitmap = aSvgData.getReplacement();
+return !rBitmap.IsEmpty();
+}
}
bool Application::LoadBrandBitmap (const char* pName, BitmapEx rBitmap)
@@ -80,13 +90,11 @@ bool Application::LoadBrandSVG (const char *pName, BitmapEx
rBitmap)
rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(-) +
aLanguageTag.getBcp47() +
aSvg );
-//rtl::OUString uri = rtl::OUString::createFromAscii(
$BRAND_BASE_DIR/program/edition ) + aLocaleName;
-rtl::OUString uri = rtl::OUString::createFromAscii(
$BRAND_BASE_DIR/program ) + aBaseName+aSvg;
-rtl::Bootstrap::expandMacros( uri );
-INetURLObject aObj( uri );
-SvgData aSvgData(aObj.PathToFileName());
-rBitmap = aSvgData.getReplacement();
-return true;
+
+return ( loadSvg ($BRAND_BASE_DIR/program/edition, aLocaleName, rBitmap)
||
+
[PATCH] Let's assume nobody needs the sbase, scalc etc scripts on OS...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3930 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3930/1 Let's assume nobody needs the sbase, scalc etc scripts on OS X It's always possible to run the soffice executable from the same location with a --base, --calc etc command-line option instead. (That is not the normal way for Mac users to open an empty document for the specific aspect of LibreOffice (Calc, Writer, etc) either. Instead, the usual way (says cloph) is to keep a corresponding template document in the Dock and click that.) Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184 --- M scp2/source/base/file_base.scp M scp2/source/calc/file_calc.scp M scp2/source/draw/file_draw.scp M scp2/source/impress/file_impress.scp M scp2/source/math/file_math.scp M scp2/source/writer/file_writer.scp 6 files changed, 12 insertions(+), 0 deletions(-) diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index fb1a230..122353e 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -27,12 +27,14 @@ #include macros.inc +#ifndef MACOSX File gid_File_Exe_Sbase BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(sbase); Styles = (PACKED); End +#endif #if defined WNT File gid_File_Exe_Odbcconfig diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 8f5dfbb..6aa84de 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -77,9 +77,11 @@ End #endif +#ifndef MACOSX File gid_File_Exe_Scalc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(scalc); Styles = (PACKED); End +#endif diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp index 4b7c4db..c757a05 100644 --- a/scp2/source/draw/file_draw.scp +++ b/scp2/source/draw/file_draw.scp @@ -42,9 +42,11 @@ End #endif +#ifndef MACOSX File gid_File_Exe_Sdraw BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(sdraw); Styles = (PACKED); End +#endif diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index bff0354..5bcb34d5 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -54,12 +54,14 @@ End #endif +#ifndef MACOSX File gid_File_Exe_Simpress BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(simpress); Styles = (PACKED); End +#endif // configuration files for custom animation effects diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 455c9ca..0c016ee 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -48,9 +48,11 @@ End #endif +#ifndef MACOSX File gid_File_Exe_Smath BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(smath); Styles = (PACKED); End +#endif diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 19e4efa..43b8127 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -27,12 +27,14 @@ #include macros.inc +#ifndef MACOSX File gid_File_Exe_Swriter BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(swriter); Styles = (PACKED); End +#endif #ifdef WNT File gid_File_Exe_Sweb -- To view, visit https://gerrit.libreoffice.org/3930 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icu/ExternalProject_icu.mk icu/icu4c-build.patch
icu/ExternalProject_icu.mk |8 +++- icu/icu4c-build.patch |2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 7f17b33acc8c3076f0696542795a1ca74ee2d671 Author: Stephan Bergmann sberg...@redhat.com Date: Fri May 17 10:50:00 2013 +0200 Fix icu library paths for Mac OS X There already was a patch to use @executable_path (which is wrong, consider e.g. when such libs are loaded into the URE uno executable), so fix it to use @_..._OOO instead (and no need to set --prefix), and pass the resulting libs through macosx-change-install-names. Change-Id: I2eb1801b64de81ac2b2844f893c9149fc78c3aa9 diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index 5ec0933..695c071 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -74,13 +74,19 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \ $(if $(filter ANDROID,$(OS)),--disable-strict) \ $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),\ --enable-static --disable-shared,\ --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\ $(MAKE) \ + $(if $(filter MACOSX,$(OS)), $(PERL) \ + $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)) \ ,source) endif diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index cf6e682..30ba3ad 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -52,7 +52,7 @@ -else -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -endif -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @__OOO/$(notdir $(MIDDLE_SO_TARGET)) ## Compiler switch to embed a runtime search path LD_RPATH= ___ 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 Fernand s...@pmg.be changed: What|Removed |Added Depends on||57079 --- Comment #18 from Fernand s...@pmg.be --- add bug 57079 because this is there sinds 3.3 and becomse worser sinds 4.01 and makes the contour feature unusable and documents started in prevsiuos versions un-editable -- 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
[PATCH] No need for the soffice.bin identical copy of soffice on OS ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3931 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/3931/1 No need for the soffice.bin identical copy of soffice on OS X Change-Id: I1e133fb53e58da4ad5e3eb02163eb6082d895b15 --- M scp2/source/ooo/common_brand.scp 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d5d39e0..f549000 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -511,12 +511,14 @@ End #endif +#ifndef MACOSX File gid_Brand_File_Bin_Soffice_Bin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = soffice.bin; End +#endif #if defined UNX ! defined MACOSX -- To view, visit https://gerrit.libreoffice.org/3931 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e133fb53e58da4ad5e3eb02163eb6082d895b15 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sc/source
sc/source/ui/view/drawview.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit fab41537089f63d37bd60082bf8592f7a6dc79b1 Author: Noel Power noel.po...@suse.com Date: Fri May 17 10:45:14 2013 +0100 Revert fdo#63878 fix the zoom problem when the sheet are RTL This reverts commit 9411d4d56374a55777019d58c1e7f45767662707. diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 7e4555d..6900932 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -791,9 +791,6 @@ void ScDrawView::SyncForGrid( SdrObject* pObj ) Point aCurPos = pViewData-GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); Point aCurPosHmm = pGridWin-PixelToLogic(aCurPos, aDrawMode ); Point aGridOff = ( aCurPosHmm - aOldPos ); -// fdo#63878 Fix the X position for RTL Sheet -if( aGridOff.getX() 0 ) -aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() ); pObj-SetGridOffset( aGridOff ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 737a580a3b96efa2e389d2e72546484af8d4d78f Author: Tor Lillqvist t...@iki.fi Date: Fri May 17 12:43:51 2013 +0300 Use bundled jpeg for the BUILD platform when cross-compiling Should fix the cross-compiling tinderboxes running on Debian at least. Change-Id: I4fad1beb1a380c69fd1c9461bbf3f4f125df69ee diff --git a/configure.ac b/configure.ac index 12d950b..7174b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -4131,6 +4131,7 @@ if test $cross_compiling = yes; then --with-parallelism=$with_parallelism \ --without-doxygen \ --without-java \ +--without-system-jpeg \ ENABLE_PDFIMPORT=FALSE \ $sub_conf_opts \ --srcdir=$srcdir \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/drawview.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 0c5320a63894919bf8dbb424b9ea52836034efde Author: Noel Power noel.po...@suse.com Date: Fri May 17 10:47:29 2013 +0100 Revert fdo#63878 fix the zoom problem when the sheet are RTL This reverts commit 9411d4d56374a55777019d58c1e7f45767662707. diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 2fe614c..e249e8c 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -782,9 +782,6 @@ void ScDrawView::SyncForGrid( SdrObject* pObj ) Point aCurPos = pViewData-GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); Point aCurPosHmm = pGridWin-PixelToLogic(aCurPos, aDrawMode ); Point aGridOff = ( aCurPosHmm - aOldPos ); -// fdo#63878 Fix the X position for RTL Sheet -if( aGridOff.getX() 0 ) -aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() ); pObj-SetGridOffset( aGridOff ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Require Review on Patch
Hi, I have submitted a patch for review around 10 days back , but it is not reviewed yet . So, if possible someone review the changes . https://gerrit.libreoffice.org/#/c/3810/ Thank You ___ 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 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||64707 -- 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 'aoo/trunk' - 5 commits - hwpfilter/source sc/source sfx2/inc sfx2/source svx/source vcl/source
hwpfilter/source/hwpreader.cxx |2
sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc |4
sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx |9 +
sfx2/source/dialog/templdlg.cxx|2
sfx2/source/sidebar/Deck.cxx |1
sfx2/source/sidebar/DeckLayouter.cxx |4
sfx2/source/sidebar/FocusManager.cxx |1
sfx2/source/sidebar/Panel.cxx | 13 -
sfx2/source/sidebar/Panel.hxx |3
sfx2/source/sidebar/PanelTitleBar.cxx | 68 +---
sfx2/source/sidebar/PanelTitleBar.hxx |8
sfx2/source/sidebar/SidebarController.cxx | 15 +
sfx2/source/sidebar/SidebarToolBox.cxx | 94 +--
sfx2/source/sidebar/TitleBar.cxx |2
sfx2/source/sidebar/TitleBar.hxx |4
svx/source/svdraw/svdfmtf.cxx | 177 ++---
vcl/source/window/dockwin.cxx | 15 +
17 files changed, 306 insertions(+), 116 deletions(-)
New commits:
commit 58b44ad7c8d46904da750c4820f4bde675953fa9
Author: Armin Le Grand a...@apache.org
Date: Fri May 17 09:58:33 2013 +
i122326 added text clipping, corrected text box distances
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index e214558..3e7cc6e 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -75,6 +75,9 @@
#include svx/xflbmtit.hxx
#include svx/xflbstit.hxx
#include svx/svdpntv.hxx
+#include basegfx/polygon/b2dpolypolygontools.hxx
+#include svx/svditer.hxx
+#include svx/svdogrp.hxx
@@ -484,63 +487,130 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj,
bool bScale)
const SdrLayerID aOldLayer(pObj-GetLayer());
const SfxItemSet aOldItemSet(pObj-GetMergedItemSet());
const SdrGrafObj* pSdrGrafObj = dynamic_cast SdrGrafObj* (pObj);
-BitmapEx aBitmapEx;
+const SdrTextObj* pSdrTextObj = dynamic_cast SdrTextObj* (pObj);
-if(pSdrGrafObj)
+if(pSdrTextObj pSdrTextObj-HasText())
{
-aBitmapEx = pSdrGrafObj-GetGraphic().GetBitmapEx();
-}
+// all text objects are created from ImportText and have no line
or fill attributes, so
+// it is okay to concentrate on the text itself
+while(true)
+{
+const basegfx::B2DPolyPolygon
aTextContour(pSdrTextObj-TakeContour());
+const basegfx::B2DRange aTextRange(aTextContour.getB2DRange());
+const basegfx::B2DRange aClipRange(maClip.getB2DRange());
+
+// no overlap - completely outside
+if(!aClipRange.overlaps(aTextRange))
+{
+SdrObject::Free(pObj);
+break;
+}
+
+// when the clip is a rectangle fast check for inside is
possible
+if(basegfx::tools::isRectangle(maClip)
aClipRange.isInside(aTextRange))
+{
+// completely inside ClipRect
+break;
+}
-SdrObject::Free(pObj);
+// here text needs to be clipped; to do so, convert to
SdrObjects with polygons
+// and add these recursively. Delete original object, do not
add in this run
+SdrObject* pConverted = pSdrTextObj-ConvertToPolyObj(true,
true);
+SdrObject::Free(pObj);
-if(!aOldRange.isEmpty())
+if(pConverted)
+{
+// recursively add created conversion; per definition this
shall not
+// contain further SdrTextObjs. Visit only non-group
objects
+SdrObjListIter aIter(*pConverted, IM_DEEPNOGROUPS);
+
+// work with clones; the created conversion may contain
group objects
+// and when working with the original objects the loop
itself could
+// break and the cleanup later would be pretty complicated
(only delete group
+// objects, are these empty, ...?)
+while(aIter.IsMore())
+{
+SdrObject* pCandidate = aIter.Next();
+OSL_ENSURE(pCandidate 0 == dynamic_cast
SdrObjGroup* (pCandidate), SdrObjListIter with IM_DEEPNOGROUPS error (!));
+SdrObject* pNewClone = pCandidate-Clone();
+
+if(pNewClone)
+{
+InsertObj(pNewClone, false);
+}
+else
+{
+OSL_ENSURE(false, SdrObject::Clone() failed (!));
+}
[PATCH libreoffice-4-0] Revert fdo#63878 fix the zoom problem when the sheet are RT...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3932 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/3932/1 Revert fdo#63878 fix the zoom problem when the sheet are RTL This reverts commit 9411d4d56374a55777019d58c1e7f45767662707. Change-Id: I1165ab1a2c0059e40c4963c99cabfcadb7d0bcb4 --- M sc/source/ui/view/drawview.cxx 1 file changed, 0 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 7e4555d..6900932 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -791,9 +791,6 @@ Point aCurPos = pViewData-GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); Point aCurPosHmm = pGridWin-PixelToLogic(aCurPos, aDrawMode ); Point aGridOff = ( aCurPosHmm - aOldPos ); -// fdo#63878 Fix the X position for RTL Sheet -if( aGridOff.getX() 0 ) -aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() ); pObj-SetGridOffset( aGridOff ); } } -- To view, visit https://gerrit.libreoffice.org/3932 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1165ab1a2c0059e40c4963c99cabfcadb7d0bcb4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/view/drawview.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 1e489d411a40c6b98966917c3849c8bcc110de34 Author: Noel Power noel.po...@suse.com Date: Fri May 17 11:05:02 2013 +0100 Revert fdo#63878 fix the zoom problem when the sheet are RTL This reverts commit 9411d4d56374a55777019d58c1e7f45767662707. Change-Id: I1165ab1a2c0059e40c4963c99cabfcadb7d0bcb4 Reviewed-on: https://gerrit.libreoffice.org/3932 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 7e4555d..6900932 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -791,9 +791,6 @@ void ScDrawView::SyncForGrid( SdrObject* pObj ) Point aCurPos = pViewData-GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); Point aCurPosHmm = pGridWin-PixelToLogic(aCurPos, aDrawMode ); Point aGridOff = ( aCurPosHmm - aOldPos ); -// fdo#63878 Fix the X position for RTL Sheet -if( aGridOff.getX() 0 ) -aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() ); pObj-SetGridOffset( aGridOff ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Revert fdo#63878 fix the zoom problem when the sheet are RT...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3932 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3932 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1165ab1a2c0059e40c4963c99cabfcadb7d0bcb4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 8186a4a1e478f5f869443d2c34d06877433e444c Author: Tor Lillqvist tlillqv...@suse.com Date: Fri May 17 13:42:42 2013 +0300 Check for ODK in BUILD_TYPE Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9 diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 4a94395..0962ac8 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -105,12 +105,14 @@ ifeq (TRUE,$(LIBO_DEV_INSTALL)) unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt rmdir $(DEVINSTALLDIR)/LibreOffice*_archive +ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(DEVINSTALLDIR)/opt/ rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk +endif else # LIBO_DEV_INSTALL $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/common_brand.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 2bd3123174269a46898ddb08e24946c6407582c4 Author: Tor Lillqvist t...@iki.fi Date: Fri May 17 12:24:00 2013 +0300 No need for the soffice.bin identical copy of soffice on OS X Change-Id: I1e133fb53e58da4ad5e3eb02163eb6082d895b15 Reviewed-on: https://gerrit.libreoffice.org/3931 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d5d39e0..f549000 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -511,12 +511,14 @@ File gid_Brand_File_Bin_Spadmin End #endif +#ifndef MACOSX File gid_Brand_File_Bin_Soffice_Bin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = soffice.bin; End +#endif #if defined UNX ! defined MACOSX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/base/file_base.scp |2 ++ scp2/source/calc/file_calc.scp |2 ++ scp2/source/draw/file_draw.scp |2 ++ scp2/source/impress/file_impress.scp |2 ++ scp2/source/math/file_math.scp |2 ++ scp2/source/writer/file_writer.scp |2 ++ 6 files changed, 12 insertions(+) New commits: commit f74e390ef2a6edd64ed976f169d56864e2c125ac Author: Tor Lillqvist t...@iki.fi Date: Fri May 17 11:33:35 2013 +0300 Let's assume nobody needs the sbase, scalc etc scripts on OS X It's always possible to run the soffice executable from the same location with a --base, --calc etc command-line option instead. (That is not the normal way for Mac users to open an empty document for the specific aspect of LibreOffice (Calc, Writer, etc) either. Instead, the usual way (says cloph) is to keep a corresponding template document in the Dock and click that.) Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184 Reviewed-on: https://gerrit.libreoffice.org/3930 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index fb1a230..122353e 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -27,12 +27,14 @@ #include macros.inc +#ifndef MACOSX File gid_File_Exe_Sbase BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(sbase); Styles = (PACKED); End +#endif #if defined WNT File gid_File_Exe_Odbcconfig diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 8f5dfbb..6aa84de 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -77,9 +77,11 @@ File gid_File_Help_Scalc_Zip End #endif +#ifndef MACOSX File gid_File_Exe_Scalc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(scalc); Styles = (PACKED); End +#endif diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp index 4b7c4db..c757a05 100644 --- a/scp2/source/draw/file_draw.scp +++ b/scp2/source/draw/file_draw.scp @@ -42,9 +42,11 @@ File gid_File_Help_Sdraw_Zip End #endif +#ifndef MACOSX File gid_File_Exe_Sdraw BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(sdraw); Styles = (PACKED); End +#endif diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index bff0354..5bcb34d5 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -54,12 +54,14 @@ File gid_File_Help_Simpress_Zip End #endif +#ifndef MACOSX File gid_File_Exe_Simpress BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(simpress); Styles = (PACKED); End +#endif // configuration files for custom animation effects diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 455c9ca..0c016ee 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -48,9 +48,11 @@ File gid_File_Help_Smath_Zip End #endif +#ifndef MACOSX File gid_File_Exe_Smath BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(smath); Styles = (PACKED); End +#endif diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 19e4efa..43b8127 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -27,12 +27,14 @@ #include macros.inc +#ifndef MACOSX File gid_File_Exe_Swriter BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(swriter); Styles = (PACKED); End +#endif #ifdef WNT File gid_File_Exe_Sweb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi, On Thursday, 2013-05-16 16:25:40 +0100, Michael Meeks wrote: + double check Lionel's list-box / API change (Eike) Done. The two properties added to com.sun.star.form.component.DataBaseListBox are marked optional which doesn't harm existing clients. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgplpko0n23nv.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] No need for the soffice.bin identical copy of soffice on OS ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3931 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3931 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e133fb53e58da4ad5e3eb02163eb6082d895b15 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Let's assume nobody needs the sbase, scalc etc scripts on OS...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3930 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3930 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - 2 commits - cui/source cui/uiconfig include/svtools officecfg/registry sd/source svtools/source
cui/source/options/optjava.cxx | 12 +++-
cui/source/options/optjava.hxx |1
cui/uiconfig/ui/optadvancedpage.ui | 19 ++
include/svtools/miscopt.hxx|3 +
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 ++
sd/source/ui/app/sddll1.cxx|6 ++
sd/source/ui/app/sddll2.cxx|1
sd/source/ui/dlg/PaneShells.cxx| 23
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 14 -
sd/source/ui/framework/factories/BasicPaneFactory.hxx |1
sd/source/ui/framework/factories/BasicViewFactory.cxx | 13
sd/source/ui/framework/module/ImpressModule.cxx| 18 ++
sd/source/ui/framework/module/ToolPanelModule.cxx |5 +
sd/source/ui/framework/module/ToolPanelModule.hxx |2
svtools/source/config/miscopt.cxx | 36 -
15 files changed, 151 insertions(+), 11 deletions(-)
New commits:
commit 3e82c25284eb368f8ed971044842fe919f24c672
Author: Michael Meeks michael.me...@suse.com
Date: Fri May 17 12:25:23 2013 +0100
more reverts, first cut at making sidebar optional.
diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx
index 09a7346..100f527 100644
--- a/sd/source/ui/app/sddll1.cxx
+++ b/sd/source/ui/app/sddll1.cxx
@@ -37,6 +37,7 @@
#include DrawDocShell.hxx
#include GraphicDocShell.hxx
#include SlideSorterViewShell.hxx
+#include taskpane/ToolPanelViewShell.hxx
#include FactoryIds.hxx
#include sdmod.hxx
#include app.hrc
@@ -114,6 +115,11 @@ void SdDLL::RegisterInterfaces()
// View shells for the side panes.
::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod);
+
+::sd::toolpanel::ToolPanelViewShell::RegisterInterface(pMod);
+// Tell the tool panel view shell to register the interfaces of its
+// controls.
+::sd::toolpanel::ToolPanelViewShell::RegisterControls();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 3088415..d28257d 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -126,6 +126,7 @@ void SdDLL::RegisterControllers()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
+::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod);
::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 023dbcc..d3338ab 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -92,6 +92,29 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void)
{
}
+//= ToolPanelPaneShell
+
+SFX_SLOTMAP( ToolPanelPaneShell )
+{
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+};
+
+SFX_IMPL_INTERFACE( ToolPanelPaneShell, SfxShell, SdResId(
STR_TOOL_PANEL_SHELL ) )
+{
+SFX_CHILDWINDOW_REGISTRATION(
::sd::ToolPanelChildWindow::GetChildWindowId() );
+}
+
+TYPEINIT1( ToolPanelPaneShell, SfxShell );
+
+ToolPanelPaneShell::ToolPanelPaneShell()
+:SfxShell()
+{
+SetName(OUString(ToolPanel));
+}
+
+ToolPanelPaneShell::~ToolPanelPaneShell(void)
+{
+}
} // end of namespace ::sd
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 5c5a043..c91265f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -45,7 +45,8 @@ namespace {
CenterPaneId,
FullScreenPaneId,
LeftImpressPaneId,
-LeftDrawPaneId
+LeftDrawPaneId,
+RightPaneId
};
static const sal_Int32 gnConfigurationUpdateStartEvent(0);
@@ -219,6 +220,11 @@ void SAL_CALL BasicPaneFactory::initialize (const
SequenceAny aArguments)
aDescriptor.mePaneId = LeftDrawPaneId;
mpPaneContainer-push_back(aDescriptor);
xCC-addResourceFactory(aDescriptor.msPaneURL, this);
+
+aDescriptor.msPaneURL = FrameworkHelper::msRightPaneURL;
+aDescriptor.mePaneId = RightPaneId;
+mpPaneContainer-push_back(aDescriptor);
+xCC-addResourceFactory(aDescriptor.msPaneURL, this);
}
// Register as configuration change listener.
@@ -287,6 +293,7 @@ ReferenceXResource SAL_CALL
BasicPaneFactory::createResource (
case LeftImpressPaneId:
case LeftDrawPaneId:
+case RightPaneId:
xPane =
Ask.LibreOffice.org and Bugzilla Twitter accounts
Hi, You know social media is a very effective channel for getting people's attention. Also it can be used a regular reminder/ping'er/poke'r for communities. So using the social media's advantages to increase the community's attention on Ask.LibreOffice.org site and Bugzilla will be good imho. We had used this method in Pardus GNU/Linux and it worked. After asking to Florian for his advice that if is this possible to use this channels for LibreOffice, i've creaed two twitter accounts. The new accounts are: LibreOffice Bugzilla: https://twitter.com/LibreOfficeBugs Ask.LibreOffice.org: https://twitter.com/AskLibreOffice I've connected ask site's new question feeds and bugzilla's new bug's feeds to this accounts. The goals of having this accounts are: · To keep more attention on questions and bugs · Make community contribution process more social · To poke/ ping community’s members and asking for the minimum contribution that can give constantly · Spread the questions and bugs to their networks to find answers as soon as possible which will increase the possibility find the person whom has the answer · Make our ask and bugzilla more open to the community and increase the number of persons(not regular contributors) Well, there is also reasons under the “What current situation misses” questions · Having lots of bugzilla mails is not for ordinary community members, people does not want their inbox is filled with bug mails which most of them are not in interested. But twitter streams are different, it comes and passes through no rubbish left there. Trying to confirm a bug is generally a simple work to do, we can involve more people(other than the regular bugbusters) to have with this feeds. · Visiting ask site is not a practical exercise made every time, or getting feeds from Google Reader is not practiced by everyone, but most people use social media actively. This means more eyes will be on ask and bug sites constantly. · As said above, having constant attention for this sites are not possible for passive contributors · There is no chance to spread the questions through LibreOffice related networks. But with this accounts, the followers will generate a core LibreOffice network which will be feed through this accounts. I hope that this accounts will help to decrease the unanswered questions in the ask site(1.191 questions ~1/3 ) and activate more members to help triage bugs in bugzilla. If you have a twitter account please follow and promote/announce this accounts. Of course the most important thing is the interest of community and the will to became a part of this wonderful community to make LibreOffice the best free Office suite ever. Best regards, Zeki ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Ask.LibreOffice.org and Bugzilla Twitter accounts
Hi Zeki, On Fri, May 17, 2013 at 02:27:05PM +0300, Zeki Bildirici wrote: We had used this method in Pardus GNU/Linux and it worked. After asking to Florian for his advice that if is this possible to use this channels for LibreOffice, i've creaed two twitter accounts. The new accounts are: LibreOffice Bugzilla: https://twitter.com/LibreOfficeBugs Ask.LibreOffice.org: https://twitter.com/AskLibreOffice thats awesome and at least for Bugs was on my TODO list for a long time (actually there was a twitter account already created). We also have: https://twitter.com/LOcommits We could also have one for gerrit updates. What are you using to feed the stuff to twitter? It might make sense to consolidate all the feeds to use the same stuff -- I would be happy to hand to over the LOcommits account. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Ask.LibreOffice.org and Bugzilla Twitter accounts
Of course the most important thing is [...] to make LibreOffice the best free Office suite ever. I thought it was already? If not, which one is? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Require Review on Patch
Anurag Kanungo wrote: I have submitted a patch for review around 10 days back , but it is not reviewed yet . Eh, terribly sorry to let this sit - just did a review in gerrit. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - cui/source sfx2/source svx/source sw/source
cui/source/tabpages/tpline.cxx|3 +--
sfx2/source/sidebar/PanelTitleBar.cxx |4 +---
sfx2/source/sidebar/SidebarController.cxx | 11 +--
sfx2/source/sidebar/SidebarController.hxx |1 +
svx/source/xoutdev/xattr2.cxx |3 +--
sw/source/ui/sidebar/PageSizeControl.cxx |4 ++--
6 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit e65bf3376ec742e2d5e69cad097d17f77fb19a73
Author: Andre Fischer a...@apache.org
Date: Fri May 17 11:58:45 2013 +
122315: Include the Tools.hxx header always.
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 9c46e5e..4917412 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -29,14 +29,12 @@
#include Panel.hxx
#include sfx2/sidebar/Theme.hxx
#include sfx2/sidebar/ControllerFactory.hxx
+#include sfx2/sidebar/Tools.hxx
#include tools/svborder.hxx
#include vcl/gradient.hxx
#include vcl/image.hxx
#include toolkit/helper/vclunohelper.hxx
-#ifdef DEBUG
-#include sfx2/sidebar/Tools.hxx
-#endif
using namespace css;
using namespace cssu;
commit b83fb522809c9b54427f60200164f878ae7f4658
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Fri May 17 11:35:46 2013 +
122310: page property panel, page size control - display page size as Width
x Height
diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx
b/sw/source/ui/sidebar/PageSizeControl.cxx
index c54f3ee..28b4908 100644
--- a/sw/source/ui/sidebar/PageSizeControl.cxx
+++ b/sw/source/ui/sidebar/PageSizeControl.cxx
@@ -116,9 +116,9 @@ PageSizeControl::PageSizeControl(
maWidthHeightField.IsUseThousandSep(),
maWidthHeightField.IsShowTrailingZeros() );
-ItemText2 = HeightStr;
+ItemText2 = WidthStr;
ItemText2 += String::CreateFromAscii( x );
-ItemText2 += WidthStr;
+ItemText2 += HeightStr;
ItemText2 += String::CreateFromAscii( );
ItemText2 += aMetricStr;
commit a30912ea805a74f2ef47e10511d6e85ed4600b73
Author: Andre Fischer a...@apache.org
Date: Fri May 17 11:13:52 2013 +
122082: React to changes read-only - read-write more realiably.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 8e230c1..fd0a1af 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -93,6 +93,10 @@ namespace {
MID_FIRST_PANEL,
MID_FIRST_HIDE = 1000
};
+
+/** When in doubt, show this deck.
+*/
+static const ::rtl::OUString gsDefaultDeckId(A2S(PropertyDeck));
}
@@ -110,7 +114,7 @@ SidebarController::SidebarController (
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
- msCurrentDeckId(A2S(PropertyDeck)),
+ msCurrentDeckId(gsDefaultDeckId),
msCurrentDeckTitle(),
maPropertyChangeForwarder(::boost::bind(SidebarController::BroadcastPropertyChange,
this)),
maContextChangeUpdate(::boost::bind(SidebarController::UpdateConfigurations,
this)),
@@ -260,7 +264,10 @@ void SAL_CALL SidebarController::statusChanged (const
css::frame::FeatureStateEv
mbIsDocumentReadOnly = !bIsReadWrite;
// Force the current deck to update its panel list.
-SwitchToDeck(msCurrentDeckId);
+if ( ! mbIsDocumentReadOnly)
+msCurrentDeckId = gsDefaultDeckId;
+maCurrentContext = Context();
+maContextChangeUpdate.RequestCall();
}
}
diff --git a/sfx2/source/sidebar/SidebarController.hxx
b/sfx2/source/sidebar/SidebarController.hxx
index dfa588c..e940974 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -163,6 +163,7 @@ private:
/** Make maRequestedContext the current context.
*/
void UpdateConfigurations (void);
+
bool ArePanelSetsEqual (
const SharedPanelContainer rCurrentPanels,
const ResourceManager::PanelContextDescriptorContainer
rRequestedPanels);
commit ee4c4e4fe15a3ec3af8e7d75cc314025793726c1
Author: Pavel JanÃk pavelja...@apache.org
Date: Fri May 17 10:18:30 2013 +
Use default case instead of handling a meta value.
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 5b8bb26..3aaadc9 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -223,8 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation(
SfxItemPresentation ePres,
nId = RID_SVXSTR_LINEJOINT_ROUND;
break;
-// Not handled?
-case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ):
+default:
break;
}
commit 0faa03061eb281510b885c7d39f2f0a3d2db10f2
Author: Pavel JanÃk pavelja...@apache.org
Date: Fri May 17 10:17:32 2013
[Libreoffice-commits] core.git: include/tools sc/source tools/source
include/tools/date.hxx |7 +++
sc/source/core/data/table4.cxx |3 +--
tools/source/datetime/tdate.cxx | 29 -
3 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit cd9d1bdf5e3351c929d5b651c009ee17b4d962c4
Author: Eike Rathke er...@redhat.com
Date: Fri May 17 14:04:34 2013 +0200
resolved fdo#63805 max day of month of the intended month
Since 6619955e72c1c2f29a32e82478d19147c0d7610a Date::GetDaysInMonth()
operates on the normalized value that corresponds to the actual values
set at the Date instance, obtain and set number of days for the intended
month instead of using the rolled-over date.
Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index 22586c4..7235182 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -138,6 +138,13 @@ public:
TOOLS_DLLPUBLIC friend Date operator -( const Date rDate, long nDays
);
TOOLS_DLLPUBLIC friend long operator -( const Date rDate1, const
Date rDate2 );
+/** Obtain number of days in a month of a year.
+
+Internally sanitizes nMonth to values 1 = nMonth = 12, does not
+normalize values.
+ */
+static sal_uInt16 GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
+
/// Internally normalizes values.
static long DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
/// Semantically identical to IsValidDate() member method.
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index d63971e..df6f52c 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1252,8 +1252,7 @@ void ScTable::IncDate(double rVal, sal_uInt16
nDayOfMonth, double nStep, FillD
{
aDate.SetMonth((sal_uInt16) nMonth);
aDate.SetYear((sal_uInt16) nYear);
-if ( nDayOfMonth 28 )
-aDate.SetDay( std::min( aDate.GetDaysInMonth(),
nDayOfMonth ) );
+aDate.SetDay( std::min( Date::GetDaysInMonth( nMonth,
nYear), nDayOfMonth ) );
}
}
break;
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 038a702..a07ee4e 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -44,7 +44,7 @@ inline sal_Bool ImpIsLeapYear( sal_uInt16 nYear )
}
// All callers must have sanitized or normalized month and year values!
-inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
if ( nMonth != 2 )
return aDaysInMonth[nMonth-1];
@@ -57,6 +57,17 @@ inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16
nYear )
}
}
+// static
+sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+{
+SAL_WARN_IF( nMonth 1 || 12 nMonth, tools, Date::GetDaysInMonth -
nMonth out of bounds nMonth);
+if (nMonth 1)
+nMonth = 1;
+else if (12 nMonth)
+nMonth = 12;
+return ImplDaysInMonth( nMonth, nYear);
+}
+
long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
{
long nDays;
@@ -66,7 +77,7 @@ long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth,
sal_uInt16 nYear )
nDays = ((sal_uIntPtr)nYear-1) * 365;
nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i nMonth; i++ )
-nDays += DaysInMonth(i,nYear);
+nDays += ImplDaysInMonth(i,nYear);
nDays += nDay;
return nDays;
}
@@ -105,9 +116,9 @@ static void DaysToDate( long nDays,
while ( bCalc );
rMonth = 1;
-while ( (sal_uIntPtr)nTempDays DaysInMonth( rMonth, rYear ) )
+while ( (sal_uIntPtr)nTempDays ImplDaysInMonth( rMonth, rYear ) )
{
-nTempDays -= DaysInMonth( rMonth, rYear );
+nTempDays -= ImplDaysInMonth( rMonth, rYear );
rMonth++;
}
rDay = (sal_uInt16)nTempDays;
@@ -179,7 +190,7 @@ sal_uInt16 Date::GetDayOfYear() const
Normalize( nDay, nMonth, nYear);
for( sal_uInt16 i = 1; i nMonth; i++ )
- nDay = nDay + ::DaysInMonth( i, nYear ); // += yields a warning on
MSVC, so don't use it
+ nDay = nDay + ::ImplDaysInMonth( i, nYear ); // += yields a warning
on MSVC, so don't use it
return nDay;
}
@@ -279,7 +290,7 @@ sal_uInt16 Date::GetDaysInMonth() const
sal_uInt16 nYear = GetYear();
Normalize( nDay, nMonth, nYear);
-return DaysInMonth( nMonth, nYear );
+return ImplDaysInMonth( nMonth, nYear );
}
sal_Bool Date::IsLeapYear() const
@@ -296,7 +307,7 @@ sal_Bool Date::IsValidAndGregorian() const
if ( !nMonth || (nMonth 12) )
return sal_False;
-if ( !nDay || (nDay DaysInMonth( nMonth, nYear )) )
+if ( !nDay || (nDay ImplDaysInMonth( nMonth, nYear
[Libreoffice-commits] libcdr.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87f6727d616d4819101f51b21c92f32232dc7e31 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri May 17 14:14:23 2013 +0200 Bump version diff --git a/configure.ac b/configure.ac index 40c6da0..84f2db1 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libcdr_version_major],[0]) m4_define([libcdr_version_minor],[0]) -m4_define([libcdr_version_micro],[13]) +m4_define([libcdr_version_micro],[14]) m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svx/source
svx/source/dialog/_contdlg.cxx |2 ++
svx/source/svdraw/svdundo.cxx |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fc63700181ab0f42eab5f98328074fe1682344f8
Author: Michael Stahl mst...@redhat.com
Date: Fri May 17 14:02:25 2013 +0200
fdo#57079: SvxSuperContourDlg: unregister configuration listener
... in destructor. Otherwise it will access freed memory when
eventually called. This crashes since OOo 3.2 but no idea why it would
appear to not crash in earlier versions.
Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index ba192eb..1b961be 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -264,6 +264,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings
*_pBindings, SfxChildWindow
SvxSuperContourDlg::~SvxSuperContourDlg()
{
+SvtMiscOptions aMiscOptions;
+aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
}
// Resize methods
commit 71f990d286c603b3bf220c8d93af69f04a45dd7a
Author: Michael Stahl mst...@redhat.com
Date: Fri May 17 13:23:34 2013 +0200
fdo#62965: fix crash in Edit Contour dialog
The pObjList is 0, so use pObj's GetModel() which should be the same.
(regression from 115054fef08998c56cba8f14472df1d15007f635)
Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 3bcace5..5026435 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -738,7 +738,7 @@ SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool
bOrdNumDirect)
nOrdNum=pObj-GetOrdNum();
}
-m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel());
+m_pListener = new ObjListListener(*this, *pObj, *pObj-GetModel());
}
SdrUndoObjList::~SdrUndoObjList()
___
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 57079, which changed state. Bug 57079 Summary: Crash Using Edit Contour dialog and then changing Configuration https://bugs.freedesktop.org/show_bug.cgi?id=57079 What|Removed |Added Status|NEW |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
[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.0.14'
Tag 'libcdr-0.0.14' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-05-17 13:30 -0700 Tagging the libcdr 0.0.14 release Changes since libcdr-0.0.13-13: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - download.lst libcdr/ExternalPackage_libcdr.mk libcdr/ExternalProject_libcdr.mk libcdr/libcdr-0.0.13.patch libcdr/UnpackedTarball_libcdr.mk
download.lst |6 +++--- libcdr/ExternalPackage_libcdr.mk |8 libcdr/ExternalProject_libcdr.mk |1 + libcdr/UnpackedTarball_libcdr.mk |6 -- libcdr/libcdr-0.0.13.patch | 20 5 files changed, 8 insertions(+), 33 deletions(-) New commits: commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri May 17 14:29:43 2013 +0200 Make libcdr build a little bit less verbose Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 7a4a246..1a22490 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --without-docs \ --disable-debug \ --disable-werror \ + --disable-weffc \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ commit 0f28a2a5e29499b62074dad4442fafa57858677d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri May 17 14:29:27 2013 +0200 Uploading new libcdr 0.0.14 Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 diff --git a/download.lst b/download.lst index c20f83b..4e0fa28 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00 -export CDR_TARBALL := libcdr-0.0.13.tar.bz2 +CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 +export CDR_TARBALL := libcdr-0.0.14.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5 @@ -68,8 +68,8 @@ export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector- export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz -export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export ODFGEN_TARBALL := d77fa4a6e3e485553e30ced8d9bb3b50-libodfgen-0.0.1.tar.bz2 +export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 9fd6d9a..d612a77 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -10,10 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ - src/lib/libcdr.h \ - src/lib/CDRDocument.h \ - src/lib/CDRStringVector.h \ - src/lib/CMXDocument.h \ + inc/libcdr/libcdr.h \ + inc/libcdr/CDRDocument.h \ + inc/libcdr/CDRStringVector.h \ + inc/libcdr/CMXDocument.h \ )) $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) diff --git a/libcdr/UnpackedTarball_libcdr.mk b/libcdr/UnpackedTarball_libcdr.mk index e5cd135..a91bc8e 100644 --- a/libcdr/UnpackedTarball_libcdr.mk +++ b/libcdr/UnpackedTarball_libcdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ - libcdr/libcdr-0.0.13.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-0.0.13.patch b/libcdr/libcdr-0.0.13.patch deleted file mode 100644 index 806437b..000 --- a/libcdr/libcdr-0.0.13.patch +++ /dev/null @@ -1,20 +0,0 @@ a/src/lib/CDRParser.cpp -+++ b/src/lib/CDRParser.cpp -@@ -32,6 +32,9 @@ - #include string.h - #include sstream - #include set -+#ifndef BOOST_ALL_NO_LIB -+#define BOOST_ALL_NO_LIB 1 -+#endif - #include boost/property_tree/json_parser.hpp - #include boost/property_tree/ptree.hpp - #include boost/spirit/include/classic.hpp -@@ -3095,7 +3098,6 @@ - if (!fflag1) - input-seek(8, WPX_SEEK_CUR); - unsigned stlId = readU32(input); -- printf(Fridrich %x\n, stlId); - unsigned numSt = readU32(input); - unsigned i = 0; - std::mapunsigned, CDRCharacterStyle charStyles; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[PATCH libreoffice-4-0] fdo#57079: SvxSuperContourDlg: unregister configuration list...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3937
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/3937/1
fdo#57079: SvxSuperContourDlg: unregister configuration listener
... in destructor. Otherwise it will access freed memory when
eventually called. This crashes since OOo 3.2 but no idea why it would
appear to not crash in earlier versions.
Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
(cherry picked from commit fc63700181ab0f42eab5f98328074fe1682344f8)
---
M svx/source/dialog/_contdlg.cxx
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index d6e77a2..94277ec 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -265,6 +265,8 @@
SvxSuperContourDlg::~SvxSuperContourDlg()
{
+SvtMiscOptions aMiscOptions;
+aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
}
// Resize methods
--
To view, visit https://gerrit.libreoffice.org/3937
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#62965: fix crash in Edit Contour dialog
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3936 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3936/1 fdo#62965: fix crash in Edit Contour dialog The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de (cherry picked from commit 71f990d286c603b3bf220c8d93af69f04a45dd7a) --- M svx/source/svdraw/svdundo.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index c4e3c29..93cf3fc 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -747,7 +747,7 @@ nOrdNum=pObj-GetOrdNum(); } -m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel()); +m_pListener = new ObjListListener(*this, *pObj, *pObj-GetModel()); } SdrUndoObjList::~SdrUndoObjList() -- To view, visit https://gerrit.libreoffice.org/3936 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] resolved fdo#63805 max day of month of the intended month
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3938
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3938/1
resolved fdo#63805 max day of month of the intended month
Since 6619955e72c1c2f29a32e82478d19147c0d7610a Date::GetDaysInMonth()
operates on the normalized value that corresponds to the actual values
set at the Date instance, obtain and set number of days for the intended
month instead of using the rolled-over date.
(cherry picked from commit cd9d1bdf5e3351c929d5b651c009ee17b4d962c4)
Conflicts:
sc/source/core/data/table4.cxx
Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c
---
M sc/source/core/data/table4.cxx
M tools/inc/tools/date.hxx
M tools/source/datetime/tdate.cxx
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 4aec7df..57c9eda 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1253,8 +1253,7 @@
{
aDate.SetMonth((sal_uInt16) nMonth);
aDate.SetYear((sal_uInt16) nYear);
-if ( nDayOfMonth 28 )
-aDate.SetDay( Min( aDate.GetDaysInMonth(), nDayOfMonth
) );
+aDate.SetDay( std::min( Date::GetDaysInMonth( nMonth,
nYear), nDayOfMonth ) );
}
}
break;
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 42c7c16..cf72a6c 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -140,6 +140,13 @@
TOOLS_DLLPUBLIC friend Date operator -( const Date rDate, long nDays
);
TOOLS_DLLPUBLIC friend long operator -( const Date rDate1, const
Date rDate2 );
+/** Obtain number of days in a month of a year.
+
+Internally sanitizes nMonth to values 1 = nMonth = 12, does not
+normalize values.
+ */
+static sal_uInt16 GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
+
/// Internally normalizes values.
static long DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
/// Semantically identical to IsValidDate() member method.
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index d1a6c94..5ead33f 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -44,7 +44,7 @@
}
// All callers must have sanitized or normalized month and year values!
-inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
if ( nMonth != 2 )
return aDaysInMonth[nMonth-1];
@@ -57,6 +57,17 @@
}
}
+// static
+sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+{
+SAL_WARN_IF( nMonth 1 || 12 nMonth, tools, Date::GetDaysInMonth -
nMonth out of bounds nMonth);
+if (nMonth 1)
+nMonth = 1;
+else if (12 nMonth)
+nMonth = 12;
+return ImplDaysInMonth( nMonth, nYear);
+}
+
long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
{
long nDays;
@@ -66,7 +77,7 @@
nDays = ((sal_uIntPtr)nYear-1) * 365;
nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i nMonth; i++ )
-nDays += DaysInMonth(i,nYear);
+nDays += ImplDaysInMonth(i,nYear);
nDays += nDay;
return nDays;
}
@@ -105,9 +116,9 @@
while ( bCalc );
rMonth = 1;
-while ( (sal_uIntPtr)nTempDays DaysInMonth( rMonth, rYear ) )
+while ( (sal_uIntPtr)nTempDays ImplDaysInMonth( rMonth, rYear ) )
{
-nTempDays -= DaysInMonth( rMonth, rYear );
+nTempDays -= ImplDaysInMonth( rMonth, rYear );
rMonth++;
}
rDay = (sal_uInt16)nTempDays;
@@ -179,7 +190,7 @@
Normalize( nDay, nMonth, nYear);
for( sal_uInt16 i = 1; i nMonth; i++ )
- nDay = nDay + ::DaysInMonth( i, nYear ); // += yields a warning on
MSVC, so don't use it
+ nDay = nDay + ::ImplDaysInMonth( i, nYear ); // += yields a warning
on MSVC, so don't use it
return nDay;
}
@@ -279,7 +290,7 @@
sal_uInt16 nYear = GetYear();
Normalize( nDay, nMonth, nYear);
-return DaysInMonth( nMonth, nYear );
+return ImplDaysInMonth( nMonth, nYear );
}
sal_Bool Date::IsLeapYear() const
@@ -296,7 +307,7 @@
if ( !nMonth || (nMonth 12) )
return sal_False;
-if ( !nDay || (nDay DaysInMonth( nMonth, nYear )) )
+if ( !nDay || (nDay ImplDaysInMonth( nMonth, nYear )) )
return sal_False;
else if ( nYear = 1582 )
{
@@ -321,7 +332,7 @@
{
if ( !nMonth || (nMonth 12) )
return false;
-if ( !nDay || (nDay DaysInMonth( nMonth, nYear )) )
+if ( !nDay || (nDay ImplDaysInMonth( nMonth, nYear )) )
return false;
return true;
}
@@ -371,7 +382,7 @@
}
}
sal_uInt16
[PATCH libreoffice-3-6] resolved fdo#63805 max day of month of the intended month
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3939
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3939/1
resolved fdo#63805 max day of month of the intended month
Since 6619955e72c1c2f29a32e82478d19147c0d7610a Date::GetDaysInMonth()
operates on the normalized value that corresponds to the actual values
set at the Date instance, obtain and set number of days for the intended
month instead of using the rolled-over date.
(cherry picked from commit cd9d1bdf5e3351c929d5b651c009ee17b4d962c4)
Conflicts:
sc/source/core/data/table4.cxx
tools/source/datetime/tdate.cxx
Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c
---
M sc/source/core/data/table4.cxx
M tools/inc/tools/date.hxx
M tools/source/datetime/tdate.cxx
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index cced07c..abc885e 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1245,8 +1245,7 @@
{
aDate.SetMonth((sal_uInt16) nMonth);
aDate.SetYear((sal_uInt16) nYear);
-if ( nDayOfMonth 28 )
-aDate.SetDay( Min( aDate.GetDaysInMonth(), nDayOfMonth
) );
+aDate.SetDay( std::min( Date::GetDaysInMonth( nMonth,
nYear), nDayOfMonth ) );
}
}
break;
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 71cc65f..5d2cb14 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -157,6 +157,13 @@
TOOLS_DLLPUBLIC friend Date operator -( const Date rDate, long nDays
);
TOOLS_DLLPUBLIC friend long operator -( const Date rDate1, const
Date rDate2 );
+/** Obtain number of days in a month of a year.
+
+Internally sanitizes nMonth to values 1 = nMonth = 12, does not
+normalize values.
+ */
+static sal_uInt16 GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
+
/// Internally normalizes values.
static long DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
/// Semantically identical to IsValidDate() member method.
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 9d17ec6..0039d22 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -61,8 +61,7 @@
// ---
// All callers must have sanitized or normalized month and year values!
-
-inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
if ( nMonth != 2 )
return aDaysInMonth[nMonth-1];
@@ -73,6 +72,17 @@
else
return aDaysInMonth[nMonth-1];
}
+}
+
+// static
+sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+{
+SAL_WARN_IF( nMonth 1 || 12 nMonth, tools, Date::GetDaysInMonth -
nMonth out of bounds nMonth);
+if (nMonth 1)
+nMonth = 1;
+else if (12 nMonth)
+nMonth = 12;
+return ImplDaysInMonth( nMonth, nYear);
}
// ---
@@ -86,7 +96,7 @@
nDays = ((sal_uIntPtr)nYear-1) * 365;
nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i nMonth; i++ )
-nDays += DaysInMonth(i,nYear);
+nDays += ImplDaysInMonth(i,nYear);
nDays += nDay;
return nDays;
}
@@ -127,9 +137,9 @@
while ( bCalc );
rMonth = 1;
-while ( (sal_uIntPtr)nTempDays DaysInMonth( rMonth, rYear ) )
+while ( (sal_uIntPtr)nTempDays ImplDaysInMonth( rMonth, rYear ) )
{
-nTempDays -= DaysInMonth( rMonth, rYear );
+nTempDays -= ImplDaysInMonth( rMonth, rYear );
rMonth++;
}
rDay = (sal_uInt16)nTempDays;
@@ -213,7 +223,7 @@
Normalize( nDay, nMonth, nYear);
for( sal_uInt16 i = 1; i nMonth; i++ )
- nDay = nDay + ::DaysInMonth( i, nYear ); // += yields a warning on
MSVC, so don't use it
+ nDay = nDay + ::ImplDaysInMonth( i, nYear ); // += yields a warning
on MSVC, so don't use it
return nDay;
}
@@ -318,7 +328,7 @@
sal_uInt16 nYear = GetYear();
Normalize( nDay, nMonth, nYear);
-return DaysInMonth( nMonth, nYear );
+return ImplDaysInMonth( nMonth, nYear );
}
// ---
@@ -339,7 +349,7 @@
if ( !nMonth || (nMonth 12) )
return sal_False;
-if ( !nDay || (nDay DaysInMonth( nMonth, nYear )) )
+if ( !nDay || (nDay ImplDaysInMonth( nMonth, nYear )) )
return sal_False;
else if ( nYear = 1582 )
{
@@ -368,7 +378,7 @@
{
if ( !nMonth || (nMonth 12) )
return false;
-if ( !nDay || (nDay
[PATCH libreoffice-3-6] fdo#62965: fix crash in Edit Contour dialog
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3940 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3940/1 fdo#62965: fix crash in Edit Contour dialog The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de (cherry picked from commit 71f990d286c603b3bf220c8d93af69f04a45dd7a) --- M svx/source/svdraw/svdundo.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 52e4f11..c01aa9b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -732,7 +732,7 @@ nOrdNum=pObj-GetOrdNum(); } -m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel()); +m_pListener = new ObjListListener(*this, *pObj, *pObj-GetModel()); } SdrUndoObjList::~SdrUndoObjList() -- To view, visit https://gerrit.libreoffice.org/3940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#57079: SvxSuperContourDlg: unregister configuration list...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3941
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3941/1
fdo#57079: SvxSuperContourDlg: unregister configuration listener
... in destructor. Otherwise it will access freed memory when
eventually called. This crashes since OOo 3.2 but no idea why it would
appear to not crash in earlier versions.
Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
(cherry picked from commit fc63700181ab0f42eab5f98328074fe1682344f8)
---
M svx/source/dialog/_contdlg.cxx
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index ddc11ed..39f6325 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -283,6 +283,8 @@
SvxSuperContourDlg::~SvxSuperContourDlg()
{
+SvtMiscOptions aMiscOptions;
+aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
}
// Resize methods
--
To view, visit https://gerrit.libreoffice.org/3941
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - officecfg/registry sd/source sd/util
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 12 ++ officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu | 14 ++ officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 55 ++ sd/source/ui/framework/tools/FrameworkHelper.cxx|4 sd/source/ui/unoidl/facreg.cxx | 38 ++ sd/source/ui/view/ToolBarManager.cxx|1 sd/source/ui/view/ViewShellBase.cxx | 13 ++ sd/source/ui/view/ViewShellImplementation.cxx |2 sd/util/sd.component|3 9 files changed, 139 insertions(+), 3 deletions(-) New commits: commit e93474c151eae2970d9c6e8801c3e3a3455da539 Author: Michael Meeks michael.me...@suse.com Date: Fri May 17 13:48:27 2013 +0100 tentatively restore more UNO / task-pane goo ... diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index 2310cc2..924d414 100644 --- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu @@ -82,6 +82,11 @@ valueprivate:resource/pane/LeftDrawPane/value /prop /node +node oor:name=R3 oor:op=replace + prop oor:name=URL +valueprivate:resource/pane/RightPane/value + /prop +/node /node /node node oor:name=F1 oor:op=replace @@ -121,6 +126,11 @@ /node node oor:name=R6 oor:op=replace prop oor:name=URL +valueprivate:resource/view/TaskPane/value + /prop +/node +node oor:name=R7 oor:op=replace + prop oor:name=URL valueprivate:resource/view/PresentationView/value /prop /node @@ -140,7 +150,7 @@ /node node oor:name=F3 oor:op=replace prop oor:name=ServiceName -valuecom.sun.star.comp.Draw.framework.TaskPanelFactory/value +valuecom.sun.star.drawing.framework.TaskPanelFactory/value !-- MMeeks -- /prop node oor:name=ResourceList node oor:name=R0a oor:op=replace diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu index 15c0a04..61b2f8d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu @@ -76,6 +76,20 @@ valuecom.sun.star.comp.framework.StatusBarFactory/value /prop /node + node oor:name=org.openoffice.Office.Impress.ImpressToolPanelFactory oor:op=replace +prop oor:name=Type + valuetoolpanel/value +/prop +prop oor:name=Name + valueDrawingFramework/value +/prop +prop oor:name=Module + valuecom.sun.star.presentation.PresentationDocument/value +/prop +prop oor:name=FactoryImplementation + valuecom.sun.star.drawing.DefaultToolPanelFactory/value +/prop + /node node oor:name=SvxPanelFactory oor:op=replace prop oor:name=Type valuetoolpanel/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index c72079b..5aa630a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -825,6 +825,61 @@ valuetrue/value /prop /node + node oor:name=private:resource/toolpanel/DrawingFramework/MasterPages oor:op=replace +prop oor:name=Visible oor:type=xs:boolean + valuefalse/value +/prop +prop oor:name=UIName oor:type=xs:string + value xml:lang=en-USMaster Pages/value +/prop +prop oor:name=ImageURL oor:type=xs:string + valueprivate:commandimage/PresentationLayout/value +/prop + /node + node oor:name=private:resource/toolpanel/DrawingFramework/Layouts oor:op=replace +prop oor:name=Visible oor:type=xs:boolean + valuefalse/value +/prop +prop oor:name=UIName oor:type=xs:string + value xml:lang=en-USLayouts/value +/prop +prop oor:name=ImageURL oor:type=xs:string + valueprivate:commandimage/ModifyPage/value +/prop + /node + node oor:name=private:resource/toolpanel/DrawingFramework/TableDesign oor:op=replace +prop oor:name=Visible oor:type=xs:boolean + valuefalse/value +/prop +prop oor:name=UIName
Re: [comment] fdo#37222 and fdo#37219 Open pdf after Export and added to ...
Thanks for the Review . I have fixed the glitches , you stated in the comments and will submit the patch . But , before submitting I am confused a little bit about the bug 37219 Add exported PDF files to recent documents that here we are talking about the recent documents of the operating system (File manager) , not of the LO file menu . Am i right ??? and in my patch, if a user Export the PDF and checks View PDF after export , then the file is opened and it is automatically added to the recent documents of the Operating System . but if user doesn't checks View PDF after export, then the file is not added to recent documents of Operating System. and in both cases above file is never added to LO recent documents list , as a PDF is not opened using LO . Whether i include bug 37219 fix in my git commit comment or not, as i think it is resolved ? So, please exactly tell me about the bug 37219 . Thanks On Fri, May 17, 2013 at 5:26 PM, Thorsten Behrens (via Code Review) ger...@gerrit.libreoffice.org wrote: Thorsten Behrens has posted comments on this change. Change subject: fdo#37222 and fdo#37219 Open pdf after Export and added to recent documents. .. Patch Set 1: This need some tweaks before it is merged (4 inline comments) Nice feature! The viewing part works perfectly, some trivial nitpicks in the inline comments. fdo#37219 does not seem fixed though, so better remove the reference from the commit comment (or fix it ;)) File filter/source/pdf/impdialog.src Line 313: }; Could be moved just a tad up? At least from Impress, there is a larger gap from the previous checkbox - or is that intended? File officecfg/registry/data/org/openoffice/Office/WebWizard.xcu Line 209: /node What is this for? Seems rather unnecessary? File vcl/inc/vcl/pdfextoutdevdata.hxx Line 112: sal_BoolGetIsViewPDF() const; What is this (and the SetIsView) for? Seems unused? File vcl/source/gdi/pdfextoutdevdata.cxx Line 555: } See question in header -- To view, visit https://gerrit.libreoffice.org/3810 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic94c0a9c6e0f7bef9727a40a8b656218f233cd61 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Anurag Kanungo anuragkanu...@gmail.com Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Ask.LibreOffice.org and Bugzilla Twitter accounts
17 May 2013 14:50 tarihinde Bjoern Michaelsen bjoern.michael...@canonical.com yazdı: Hi Zeki, Hi Bjoern We could also have one for gerrit updates. What are you using to feed the stuff to twitter? It might make sense to consolidate all the feeds to use the same stuff. I used tweeterfeed.com for Ask, and dlvr.it for buzgilla. Both works well. @Tor Of course it is, we can change the about section as per the suggestions :) Best regards, Zeki ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/clipcontext.hxx | 13 +++--
sc/inc/column.hxx |3 ++-
sc/inc/table.hxx|6 ++
sc/source/core/data/clipcontext.cxx | 15 ++-
sc/source/core/data/column.cxx |4 ++--
sc/source/core/data/document.cxx|8
sc/source/core/data/table2.cxx | 14 +++---
7 files changed, 42 insertions(+), 21 deletions(-)
New commits:
commit 0382595ab85cede79419770010840a5c6278c616
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri May 17 10:02:05 2013 -0400
Move the boolean flags to the context bucket.
To reduce the number of function parameters lower.
Change-Id: I816bd7c27070597f5fcdf69bdc7d981279390ca6
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index e28d265..0df627c 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -30,6 +30,8 @@ class ClipContextBase
SCTAB mnTabStart;
SCTAB mnTabEnd;
+ClipContextBase(); // disabled
+
public:
ClipContextBase(ScDocument rDoc);
virtual ~ClipContextBase();
@@ -44,7 +46,6 @@ public:
class CopyFromClipContext : public ClipContextBase
{
-
ScDocument* mpRefUndoDoc;
ScDocument* mpClipDoc;
sal_uInt16 mnInsertFlag;
@@ -69,9 +70,17 @@ public:
class CopyToClipContext : public ClipContextBase
{
+bool mbKeepScenarioFlags:1;
+bool mbCloneNotes:1;
+
+CopyToClipContext(); // disabled
+
public:
-CopyToClipContext(ScDocument rDoc);
+CopyToClipContext(ScDocument rDoc, bool bKeepScenarioFlags, bool
bCloneNotes);
virtual ~CopyToClipContext();
+
+bool isKeepScenarioFlags() const;
+bool isCloneNotes() const;
};
}
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0eab575..4e5688c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -216,7 +216,8 @@ public:
voidInsertRow( SCROW nStartRow, SCSIZE nSize );
voidDeleteRow( SCROW nStartRow, SCSIZE nSize );
voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
-void CopyToClip( sc::CopyToClipContext rCxt, SCROW nRow1, SCROW nRow2,
ScColumn rColumn, bool bKeepScenarioFlags ) const;
+void CopyToClip(
+sc::CopyToClipContext rCxt, SCROW nRow1, SCROW nRow2, ScColumn
rColumn ) const;
void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn rDestCol);
void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn rDestCol
);
bool InitBlockPosition( sc::ColumnBlockPosition rBlockPos );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2538a0b..9b0d4d2 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -380,10 +380,8 @@ public:
bool* pUndoOutline = NULL );
voidDeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uInt16 nDelFlag);
-void CopyToClip( sc::CopyToClipContext rCxt, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, ScTable* pTable,
- bool bKeepScenarioFlags, bool bCloneNoteCaptions );
-void CopyToClip( sc::CopyToClipContext rCxt, const ScRangeList rRanges,
ScTable* pTable,
- bool bKeepScenarioFlags, bool bCloneNoteCaptions );
+void CopyToClip( sc::CopyToClipContext rCxt, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, ScTable* pTable );
+void CopyToClip( sc::CopyToClipContext rCxt, const ScRangeList rRanges,
ScTable* pTable );
void CopyStaticToDocument(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScTable* pDestTab);
void CopyCellToDocument( SCCOL nSrcCol, SCROW nSrcRow, SCCOL nDestCol,
SCROW nDestRow, ScTable rDestTab );
diff --git a/sc/source/core/data/clipcontext.cxx
b/sc/source/core/data/clipcontext.cxx
index e3db67d..8a02cea 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -101,9 +101,22 @@ bool CopyFromClipContext::isSkipAttrForEmptyCells() const
return mbSkipAttrForEmptyCells;
}
-CopyToClipContext::CopyToClipContext(ScDocument rDoc) : ClipContextBase(rDoc)
{}
+CopyToClipContext::CopyToClipContext(
+ScDocument rDoc, bool bKeepScenarioFlags, bool bCloneNotes) :
+ClipContextBase(rDoc), mbKeepScenarioFlags(bKeepScenarioFlags),
mbCloneNotes(bCloneNotes) {}
+
CopyToClipContext::~CopyToClipContext() {}
+bool CopyToClipContext::isKeepScenarioFlags() const
+{
+return mbKeepScenarioFlags;
+}
+
+bool CopyToClipContext::isCloneNotes() const
+{
+return mbCloneNotes;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 655918b..9fb6406 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1185,10 +1185,10 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize
)
void ScColumn::CopyToClip(
-sc::CopyToClipContext rCxt, SCROW nRow1, SCROW nRow2, ScColumn rColumn,
bool bKeepScenarioFlags) const
+sc::CopyToClipContext rCxt, SCROW
[Libreoffice-commits] core.git: boost/boost.libcdr.warnings.patch.1 boost/UnpackedTarball_boost.mk
boost/UnpackedTarball_boost.mk |1
boost/boost.libcdr.warnings.patch.1 | 694
2 files changed, 695 insertions(+)
New commits:
commit 6389bf38961d84fd3e1c8fbdc78040e1b1be3ba9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri May 17 16:04:07 2013 +0200
Silence a bit libcdr build
Change-Id: I9bae7d0ea71072168ba53d7376e816bcd05722fa
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 687a163..658fcb0 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -40,6 +40,7 @@ boost_patches += boost.wundef.patch.1
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
+boost_patches += boost.libcdr.warnings.patch.1
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
ifeq (GCC,$(COM))
diff --git a/boost/boost.libcdr.warnings.patch.1
b/boost/boost.libcdr.warnings.patch.1
new file mode 100644
index 000..2df0e3b
--- /dev/null
+++ b/boost/boost.libcdr.warnings.patch.1
@@ -0,0 +1,694 @@
+--- boost/boost/archive/basic_archive.hpp 2010-08-11 20:15:46.0
+0200
boost/boost/archive/basic_archive.hpp 2013-05-17 15:39:58.62469
+0200
+@@ -54,7 +54,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const base_type () const {
++operator base_type () const {
+ return t;
+ }
+ // used for text input
+@@ -90,7 +90,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const base_type () const {
++operator base_type () const {
+ return t;
+ }
+ // used for text intput
+@@ -127,7 +127,7 @@
+ }
+
+ // used for text output
+-operator const int () const {
++operator int () const {
+ return t;
+ }
+ // used for text input
+@@ -161,7 +161,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const uint_least32_t () const {
++operator uint_least32_t () const {
+ return t;
+ }
+ // used for text input
+@@ -254,7 +254,7 @@
+ #define BOOST_ARCHIVE_STRONG_TYPEDEF(T, D) \
+ class D : public T { \
+ public:\
+-explicit D(const T t) : T(t){} \
++explicit D(const T t_) : T(t_){} \
+ }; \
+ /**/
+
+--- boost/boost/multi_index/detail/index_matcher.hpp 2008-07-03
18:51:53.0 +0200
boost/boost/multi_index/detail/index_matcher.hpp 2013-05-17
15:30:12.539099597 +0200
+@@ -132,17 +132,17 @@
+ entries(),entries()+size_,
+ entry(node),entry::less_by_node()); /* localize entry */
+ ent-ordered=false;
+-std::size_t n=ent-pos; /* get its position */
++std::size_t n_=ent-pos; /* get its position */
+
+ entry dummy(0);
+-dummy.pile_top=n;
++dummy.pile_top=n_;
+
+ entry* pile_ent=/* find the first available pile
*/
+ std::lower_bound( /* to stack the entry
*/
+ entries(),entries()+num_piles,
+ dummy,entry::less_by_pile_top());
+
+-pile_ent-pile_top=n; /* stack the entry */
++pile_ent-pile_top=n_; /* stack the entry */
+ pile_ent-pile_top_entry=ent;
+
+ /* if not the first pile, link entry to top of the preceding pile */
+@@ -164,7 +164,7 @@
+*/
+
+ entry* ent=entries()[num_piles-1].pile_top_entry;
+- for(std::size_t n=num_piles;n--;){
++ for(std::size_t n_=num_piles;n_--;){
+ ent-ordered=true;
+ ent=ent-previous;
+ }
+--- boost/boost/multi_index/ordered_index.hpp 2010-07-25 12:44:55.0
+0200
boost/boost/multi_index/ordered_index.hpp 2013-05-17 15:33:42.785182819
+0200
+@@ -436,9 +436,9 @@
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+ iterator find(
+-const CompatibleKey x,const CompatibleCompare comp)const
++const CompatibleKey x,const CompatibleCompare comp_)const
+ {
+-return make_iterator(ordered_index_find(root(),header(),key,x,comp));
++return make_iterator(ordered_index_find(root(),header(),key,x,comp_));
+ }
+
+ templatetypename CompatibleKey
+@@ -448,9 +448,9 @@
+ }
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+- size_type count(const CompatibleKey x,const CompatibleCompare comp)const
++ size_type count(const CompatibleKey x,const CompatibleCompare comp_)const
+ {
+-std::pairiterator,iterator p=equal_range(x,comp);
++std::pairiterator,iterator p=equal_range(x,comp_);
+ size_type n=std::distance(p.first,p.second);
+ return n;
+ }
+@@ -464,10 +464,10 @@
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+ iterator lower_bound(
+-const
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +
sfx2/source/sidebar/Deck.cxx |4 ---
sfx2/source/sidebar/SidebarController.cxx| 14 ---
3 files changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 09d043596e8283dd6ced26d1e4ff0da530252df0
Author: Andre Fischer a...@apache.org
Date: Fri May 17 12:23:50 2013 +
122219: Show 'Cell Appearance' and 'Number Format' panels when editing
cells.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 927747c..d05cdae 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -752,6 +752,7 @@
value oor:separator=;
Calc, Auditing, visible ;
Calc, Cell, visible ;
+Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot,visible ;
/value
@@ -781,6 +782,7 @@
value oor:separator=;
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot,hidden ;
/value
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 76a83b1..416fb0d 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -299,8 +299,6 @@ const SharedPanelContainer Deck::GetPanels (void) const
void Deck::RequestLayout (void)
{
-//PrintWindowTree();
-
DeckLayouter::LayoutDeck(
GetContentArea(),
maPanels,
@@ -309,8 +307,6 @@ void Deck::RequestLayout (void)
*mpScrollContainer,
*mpFiller,
*mpVerticalScrollBar);
-
-Invalidate();
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index fd0a1af..a6a4d73 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -526,20 +526,6 @@ void SidebarController::SwitchToDeck (
}
}
-if (mpCurrentDeck
- ArePanelSetsEqual(mpCurrentDeck-GetPanels(),
aPanelContextDescriptors))
-{
-// Requested set of panels is identical to the current set of
-// panels = Nothing to do.
-return;
-}
-
-// When the document is read-only, check if there are any panels that
can still be displayed.
-if (mbIsDocumentReadOnly)
-{
-}
-
-
// Provide a configuration and Deck object.
if ( ! mpCurrentDeck)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] Make libcdr build a little bit less verbose
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3943 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3943/1 Make libcdr build a little bit less verbose (cherry picked from commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1) Conflicts: libcdr/ExternalProject_libcdr.mk Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 --- M libcdr/ExternalProject_libcdr.mk 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index d7e7693..56378ab 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -73,6 +73,7 @@ --without-docs \ --disable-debug \ --disable-werror \ + --disable-weffc \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ -- To view, visit https://gerrit.libreoffice.org/3943 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Silence a bit libcdr build
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3944
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/3944/1
Silence a bit libcdr build
Change-Id: I9bae7d0ea71072168ba53d7376e816bcd05722fa
(cherry picked from commit 6389bf38961d84fd3e1c8fbdc78040e1b1be3ba9)
---
M boost/UnpackedTarball_boost.mk
A boost/boost.libcdr.warnings.patch.1
2 files changed, 695 insertions(+), 0 deletions(-)
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index b7c22f5..0682306 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -35,6 +35,7 @@
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
+boost_patches += boost.libcdr.warnings.patch.1
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
ifeq (GCC,$(COM))
diff --git a/boost/boost.libcdr.warnings.patch.1
b/boost/boost.libcdr.warnings.patch.1
new file mode 100644
index 000..2df0e3b
--- /dev/null
+++ b/boost/boost.libcdr.warnings.patch.1
@@ -0,0 +1,694 @@
+--- boost/boost/archive/basic_archive.hpp 2010-08-11 20:15:46.0
+0200
boost/boost/archive/basic_archive.hpp 2013-05-17 15:39:58.62469
+0200
+@@ -54,7 +54,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const base_type () const {
++operator base_type () const {
+ return t;
+ }
+ // used for text input
+@@ -90,7 +90,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const base_type () const {
++operator base_type () const {
+ return t;
+ }
+ // used for text intput
+@@ -127,7 +127,7 @@
+ }
+
+ // used for text output
+-operator const int () const {
++operator int () const {
+ return t;
+ }
+ // used for text input
+@@ -161,7 +161,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const uint_least32_t () const {
++operator uint_least32_t () const {
+ return t;
+ }
+ // used for text input
+@@ -254,7 +254,7 @@
+ #define BOOST_ARCHIVE_STRONG_TYPEDEF(T, D) \
+ class D : public T { \
+ public:\
+-explicit D(const T t) : T(t){} \
++explicit D(const T t_) : T(t_){} \
+ }; \
+ /**/
+
+--- boost/boost/multi_index/detail/index_matcher.hpp 2008-07-03
18:51:53.0 +0200
boost/boost/multi_index/detail/index_matcher.hpp 2013-05-17
15:30:12.539099597 +0200
+@@ -132,17 +132,17 @@
+ entries(),entries()+size_,
+ entry(node),entry::less_by_node()); /* localize entry */
+ ent-ordered=false;
+-std::size_t n=ent-pos; /* get its position */
++std::size_t n_=ent-pos; /* get its position */
+
+ entry dummy(0);
+-dummy.pile_top=n;
++dummy.pile_top=n_;
+
+ entry* pile_ent=/* find the first available pile
*/
+ std::lower_bound( /* to stack the entry
*/
+ entries(),entries()+num_piles,
+ dummy,entry::less_by_pile_top());
+
+-pile_ent-pile_top=n; /* stack the entry */
++pile_ent-pile_top=n_; /* stack the entry */
+ pile_ent-pile_top_entry=ent;
+
+ /* if not the first pile, link entry to top of the preceding pile */
+@@ -164,7 +164,7 @@
+*/
+
+ entry* ent=entries()[num_piles-1].pile_top_entry;
+- for(std::size_t n=num_piles;n--;){
++ for(std::size_t n_=num_piles;n_--;){
+ ent-ordered=true;
+ ent=ent-previous;
+ }
+--- boost/boost/multi_index/ordered_index.hpp 2010-07-25 12:44:55.0
+0200
boost/boost/multi_index/ordered_index.hpp 2013-05-17 15:33:42.785182819
+0200
+@@ -436,9 +436,9 @@
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+ iterator find(
+-const CompatibleKey x,const CompatibleCompare comp)const
++const CompatibleKey x,const CompatibleCompare comp_)const
+ {
+-return make_iterator(ordered_index_find(root(),header(),key,x,comp));
++return make_iterator(ordered_index_find(root(),header(),key,x,comp_));
+ }
+
+ templatetypename CompatibleKey
+@@ -448,9 +448,9 @@
+ }
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+- size_type count(const CompatibleKey x,const CompatibleCompare comp)const
++ size_type count(const CompatibleKey x,const CompatibleCompare comp_)const
+ {
+-std::pairiterator,iterator p=equal_range(x,comp);
++std::pairiterator,iterator p=equal_range(x,comp_);
+ size_type n=std::distance(p.first,p.second);
+ return n;
+ }
+@@ -464,10 +464,10 @@
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+ iterator
[PATCH] fdo#37222 and possibly fdo#37219
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3945
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/3945/1
fdo#37222 and possibly fdo#37219
Added an checkbox option View PDF after Export in Export as Pdf Dialog Box .
If a user ticks the checkbox , pdf file will be opened after export
else only export will be done .
Goto File Export as PDF Tick the checkbox View PDF after Export
to observe changes .
There is a lot of space in between last checkbox and this ViewPDF checkbox ,
because if we
open impress and check export as pdf , there are more options in the dialog.
If user export PDF and check view PDF after export, the PDF file is added to
recent documents of the OS . ( tested on opensuse)
It will require make dev-install to work properly .
Change-Id: Id4f5cf5b7c6b0a917a46cdcdd308d8bb3e3cf127
---
M filter/source/pdf/impdialog.cxx
M filter/source/pdf/impdialog.hrc
M filter/source/pdf/impdialog.hxx
M filter/source/pdf/impdialog.src
M filter/source/pdf/pdfexport.cxx
M filter/source/pdf/pdfexport.hxx
M filter/source/pdf/pdffilter.cxx
M officecfg/registry/schema/org/openoffice/Office/Common.xcs
8 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9ddf052..d265328 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -80,6 +80,7 @@
mnMaxImageResolution( 300 ),
mbUseTaggedPDF( sal_False ),
mbExportNotes( sal_True ),
+mbViewPDF( sal_False ),
mbExportNotesPages( sal_False ),
mbUseTransitionEffects( sal_False ),
mbIsSkipEmptyPages( sal_True ),
@@ -192,6 +193,7 @@
if ( mbIsPresentation )
mbExportNotesPages = maConfigItem.ReadBool( ExportNotesPages,
sal_False );
mbExportNotes = maConfigItem.ReadBool( ExportNotes, sal_False );
+mbViewPDF = maConfigItem.ReadBool( ViewPDFAfterExport, sal_False );
mbExportBookmarks = maConfigItem.ReadBool( ExportBookmarks, sal_True );
if ( mbIsPresentation )
@@ -360,6 +362,7 @@
if ( mbIsPresentation )
maConfigItem.WriteBool( ExportNotesPages, mbExportNotesPages );
maConfigItem.WriteBool( ExportNotes, mbExportNotes );
+maConfigItem.WriteBool( ViewPDFAfterExport, mbViewPDF );
maConfigItem.WriteBool( ExportBookmarks, mbExportBookmarks );
if ( mbIsPresentation )
@@ -511,6 +514,7 @@
maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
+maCbViewPDF( this, PDFFilterResId( CB_VIEWPDF ) ),
maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
@@ -624,6 +628,7 @@
maCbExportBookmarks.Check( paParent-mbExportBookmarks );
maCbExportNotes.Check( paParent-mbExportNotes );
+maCbViewPDF.Check( paParent-mbViewPDF);
if ( mbIsPresentation )
{
@@ -668,6 +673,7 @@
paParent-mbReduceImageResolution = maCbReduceImageResolution.IsChecked();
paParent-mnMaxImageResolution =
maCoReduceImageResolution.GetText().toInt32();
paParent-mbExportNotes = maCbExportNotes.IsChecked();
+paParent-mbViewPDF = maCbViewPDF.IsChecked();
if ( mbIsPresentation )
paParent-mbExportNotesPages = maCbExportNotesPages.IsChecked();
paParent-mbExportBookmarks = maCbExportBookmarks.IsChecked();
@@ -702,6 +708,7 @@
paParent-mbExportFormFields = maCbExportFormFields.IsChecked();
paParent-mbEmbedStandardFonts = maCbEmbedStandardFonts.IsChecked();
}
+
paParent-maWatermarkText = maEdWatermark.GetText();
/*
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 03b6d55..938b622 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -87,6 +87,7 @@
#define CB_WATERMARK32
#define FT_WATERMARK33
#define ED_WATERMARK34
+#define CB_VIEWPDF 35
//controls for open options tab page
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 11a3f38..4049d53 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -94,6 +94,7 @@
sal_BoolmbUseTaggedPDF;
sal_Int32 mnPDFTypeSelection;
sal_BoolmbExportNotes;
+sal_BoolmbViewPDF;
sal_BoolmbExportNotesPages;
sal_BoolmbUseTransitionEffects;
sal_BoolmbIsSkipEmptyPages;
@@ -210,6 +211,7 @@
CheckBoxmaCbExportBookmarks;
CheckBoxmaCbExportHiddenSlides;
CheckBox
[PATCH libreoffice-4-0] Uploading new libcdr 0.0.14
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3942 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3942/1 Uploading new libcdr 0.0.14 (cherry picked from commit 0f28a2a5e29499b62074dad4442fafa57858677d) Conflicts: download.lst libcdr/UnpackedTarball_libcdr.mk libcdr/libcdr-0.0.13.patch Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 --- M download.lst M libcdr/ExternalPackage_libcdr.mk M libcdr/UnpackedTarball_cdr.mk D libcdr/libcdr-0.0.13.patch 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/download.lst b/download.lst index 657a418..aa1f98c 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00 -export CDR_TARBALL := libcdr-0.0.13.tar.bz2 +CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 +export CDR_TARBALL := libcdr-0.0.14.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index d032e8f..b163eed 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -10,10 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ - src/lib/libcdr.h \ - src/lib/CDRDocument.h \ - src/lib/CDRStringVector.h \ - src/lib/CMXDocument.h \ + inc/libcdr/libcdr.h \ + inc/libcdr/CDRDocument.h \ + inc/libcdr/CDRStringVector.h \ + inc/libcdr/CMXDocument.h \ )) $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index a4a427d..be1e7d7 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-0.0.13.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-0.0.13.patch b/libcdr/libcdr-0.0.13.patch deleted file mode 100644 index 29b2b28..000 --- a/libcdr/libcdr-0.0.13.patch +++ /dev/null @@ -1,12 +0,0 @@ a/src/lib/CDRParser.cpp -+++ b/src/lib/CDRParser.cpp -@@ -32,6 +32,9 @@ - #include string.h - #include sstream - #include set -+#ifndef BOOST_ALL_NO_LIB -+#define BOOST_ALL_NO_LIB 1 -+#endif - #include boost/property_tree/json_parser.hpp - #include boost/property_tree/ptree.hpp - #include boost/spirit/include/classic.hpp -- To view, visit https://gerrit.libreoffice.org/3942 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/print.hxx |1 +
vcl/source/gdi/print3.cxx | 45 +
2 files changed, 42 insertions(+), 4 deletions(-)
New commits:
commit 7a5bfde13afd98f1a8e110a96a636119da2ad911
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 17 15:20:11 2013 +0100
Related: fdo#61186 ensure printer settings paper format is not clobbered
scenario 1: with attached test document
a file-printer settings-properties-paper
set a paper size, ideally something not used in the test doc, e.g.
Executive
b file-print-print
c file-printer settings-properties-paper
the paper size here should now still be what was selected in a and
*not* what happened to be the last page format used in the document
which is letter
Change-Id: I66be32e2d03381dc2103479f1be46669a342a2ab
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index c0cb364..f40801e 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -522,6 +522,7 @@ public:
SAL_DLLPRIVATE void setReversePrint( sal_Bool i_bReverse );
SAL_DLLPRIVATE bool getReversePrint() const;
SAL_DLLPRIVATE void pushPropertiesToPrinter();
+SAL_DLLPRIVATE void resetPaperToLastConfigured();
VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState );
SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent );
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 3d0e4b0..0eb299d 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -159,12 +159,14 @@ public:
ImplPageCache maPageCache;
-// set by user through printer config dialog
+// set by user through printer properties subdialog of printer settings
dialog
+Size
maDefaultPageSize;
+// Set by user through printer properties subdialog of print dialog.
// if set, pages are centered and trimmed onto the fixed page
Size
maFixedPageSize;
-// set by user through printer config dialog
+// set by user through printer properties subdialog of printer settings
dialog
sal_Int32
mnDefaultPaperBin;
-// Set by user through printer preferences in print dialog.
+// Set by user through printer properties subdialog of print dialog.
// Overrides application-set tray for a page.
sal_Int32
mnFixedPaperBin;
@@ -203,6 +205,7 @@ public:
bool isFixedPageSize() const
{ return maFixedPageSize.Width() != 0 maFixedPageSize.Height() != 0; }
PrinterController::PageSize modifyJobSetup( const Sequence PropertyValue
i_rProps, bool bNoNUP );
+void resetPaperToLastConfigured();
};
PrinterController::PrinterController( const boost::shared_ptrPrinter
i_pPrinter )
@@ -502,6 +505,8 @@ void Printer::ImplPrintJob( const
boost::shared_ptrPrinterController i_pContr
pController-getPrinter()-StartJob( String( aJobName ), pController );
+pController-resetPaperToLastConfigured();
+
pController-jobFinished( pController-getJobState() );
}
@@ -756,10 +761,15 @@ void PrinterController::setPrinter( const
boost::shared_ptrPrinter i_rPrinter
setValue( OUString( Name ),
makeAny( OUString( i_rPrinter-GetName() ) ) );
mpImplData-mnDefaultPaperBin = mpImplData-mpPrinter-GetPaperBin();
+mpImplData-mpPrinter-Push();
+mpImplData-mpPrinter-SetMapMode(MapMode(MAP_100TH_MM));
+mpImplData-maDefaultPageSize = mpImplData-mpPrinter-GetPaperSize();
+mpImplData-mpPrinter-Pop();
mpImplData-mnFixedPaperBin = -1;
+mpImplData-maFixedPageSize = Size();
}
-void PrinterController:: resetPrinterOptions( bool i_bFileOutput )
+void PrinterController::resetPrinterOptions( bool i_bFileOutput )
{
PrinterOptions aOpt;
aOpt.ReadFromConfig( i_bFileOutput );
@@ -861,6 +871,28 @@ PrinterController::PageSize
vcl::ImplPrinterControllerData::modifyJobSetup( cons
return aPageSize;
}
+//fdo#61886
+//
+//when printing is finished, set the paper size of the printer to either what
+//the user explicitly set as the desired paper size, or fallback to whatever
+//the printer had before printing started. That way it doesn't contain the last
+//paper size of a multiple paper size using document when we are in our normal
+//auto accept document paper size mode and end up overwriting the original
+//paper size setting for file-printer_settings just by pressing ok in the
+//print dialog
+void vcl::ImplPrinterControllerData::resetPaperToLastConfigured()
+{
+Size aPaperSize(maDefaultPageSize);
+if (maFixedPageSize.Width() 0 maFixedPageSize.Height() 0)
+aPaperSize = maFixedPageSize;
+mpPrinter-Push();
+mpPrinter-SetMapMode(MapMode(MAP_100TH_MM));
+Size
RE: hints asked for fdo#59727
Hi Eike, The correct place would be a duplicate of saFuncTableOdf[], say saFuncTableOOoLO[], just to keep things cleanly separated because the functions are only known to LO and not defined in OpenFormula. The saFuncTableOOoLO also needs to be added to FunctionProviderImpl::FunctionProviderImpl() after the init of saFuncTableOdf. ... If I understand you correctly, WEEKS in an ods should translate to 'org.openoffice.weeks' when saving tp xlsx, which should be translated to WEEKS when saving to ods. Am I correct? Yes. Respectively use uppercase ORG.OPENOFFICE.WEEKS for .xlsx; setting the table up like described should solve things. I don't seem to get anywhere for some reason. The behaviour as described in the february-comments in bug 59727 could be reproduced with version 4.0.0, but can't be reproduced with version 4.0.3 or master. It can be reproduced with version 3.6 (openSUSE). On master the behaviour with or without patched code (saFuncTableOOoLO added including addition to FunctionProviderImpl::FunctionProviderImpl()) is the same: in a reopened xlsx file the add-in function is shown as com.sum.star.sheet.addin.datefunctions.getdiffweeks(...). Not having Excel (don't want to) nor having experience with building other versions than master, I don't know how to proceed. I can send the diff to gerrit marked as WIP, but the code is straightforward, I've only added WEEKS, MONTHS YEARS to test with. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source tools/inc tools/source
sc/source/core/data/table4.cxx |3 +--
tools/inc/tools/date.hxx|7 +++
tools/source/datetime/tdate.cxx | 29 -
3 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit 0b183466bcdf56c9221ab28be9c52ed8787fe4ea
Author: Eike Rathke er...@redhat.com
Date: Fri May 17 14:04:34 2013 +0200
resolved fdo#63805 max day of month of the intended month
Since 6619955e72c1c2f29a32e82478d19147c0d7610a Date::GetDaysInMonth()
operates on the normalized value that corresponds to the actual values
set at the Date instance, obtain and set number of days for the intended
month instead of using the rolled-over date.
(cherry picked from commit cd9d1bdf5e3351c929d5b651c009ee17b4d962c4)
Conflicts:
sc/source/core/data/table4.cxx
Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c
Reviewed-on: https://gerrit.libreoffice.org/3938
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 4aec7df..57c9eda 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1253,8 +1253,7 @@ void ScTable::IncDate(double rVal, sal_uInt16
nDayOfMonth, double nStep, FillD
{
aDate.SetMonth((sal_uInt16) nMonth);
aDate.SetYear((sal_uInt16) nYear);
-if ( nDayOfMonth 28 )
-aDate.SetDay( Min( aDate.GetDaysInMonth(), nDayOfMonth
) );
+aDate.SetDay( std::min( Date::GetDaysInMonth( nMonth,
nYear), nDayOfMonth ) );
}
}
break;
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 42c7c16..cf72a6c 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -140,6 +140,13 @@ public:
TOOLS_DLLPUBLIC friend Date operator -( const Date rDate, long nDays
);
TOOLS_DLLPUBLIC friend long operator -( const Date rDate1, const
Date rDate2 );
+/** Obtain number of days in a month of a year.
+
+Internally sanitizes nMonth to values 1 = nMonth = 12, does not
+normalize values.
+ */
+static sal_uInt16 GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
+
/// Internally normalizes values.
static long DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
/// Semantically identical to IsValidDate() member method.
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index d1a6c94..5ead33f 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -44,7 +44,7 @@ inline sal_Bool ImpIsLeapYear( sal_uInt16 nYear )
}
// All callers must have sanitized or normalized month and year values!
-inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
if ( nMonth != 2 )
return aDaysInMonth[nMonth-1];
@@ -57,6 +57,17 @@ inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16
nYear )
}
}
+// static
+sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+{
+SAL_WARN_IF( nMonth 1 || 12 nMonth, tools, Date::GetDaysInMonth -
nMonth out of bounds nMonth);
+if (nMonth 1)
+nMonth = 1;
+else if (12 nMonth)
+nMonth = 12;
+return ImplDaysInMonth( nMonth, nYear);
+}
+
long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
{
long nDays;
@@ -66,7 +77,7 @@ long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth,
sal_uInt16 nYear )
nDays = ((sal_uIntPtr)nYear-1) * 365;
nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i nMonth; i++ )
-nDays += DaysInMonth(i,nYear);
+nDays += ImplDaysInMonth(i,nYear);
nDays += nDay;
return nDays;
}
@@ -105,9 +116,9 @@ static void DaysToDate( long nDays,
while ( bCalc );
rMonth = 1;
-while ( (sal_uIntPtr)nTempDays DaysInMonth( rMonth, rYear ) )
+while ( (sal_uIntPtr)nTempDays ImplDaysInMonth( rMonth, rYear ) )
{
-nTempDays -= DaysInMonth( rMonth, rYear );
+nTempDays -= ImplDaysInMonth( rMonth, rYear );
rMonth++;
}
rDay = (sal_uInt16)nTempDays;
@@ -179,7 +190,7 @@ sal_uInt16 Date::GetDayOfYear() const
Normalize( nDay, nMonth, nYear);
for( sal_uInt16 i = 1; i nMonth; i++ )
- nDay = nDay + ::DaysInMonth( i, nYear ); // += yields a warning on
MSVC, so don't use it
+ nDay = nDay + ::ImplDaysInMonth( i, nYear ); // += yields a warning
on MSVC, so don't use it
return nDay;
}
@@ -279,7 +290,7 @@ sal_uInt16 Date::GetDaysInMonth() const
sal_uInt16 nYear = GetYear();
Normalize( nDay, nMonth, nYear);
-return DaysInMonth( nMonth, nYear );
+
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source tools/inc tools/source
sc/source/core/data/table4.cxx |3 +--
tools/inc/tools/date.hxx|7 +++
tools/source/datetime/tdate.cxx | 30 --
3 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 5e159b9834731a0282e45d8e5f5bbaedb624dc6b
Author: Eike Rathke er...@redhat.com
Date: Fri May 17 14:04:34 2013 +0200
resolved fdo#63805 max day of month of the intended month
Since 6619955e72c1c2f29a32e82478d19147c0d7610a Date::GetDaysInMonth()
operates on the normalized value that corresponds to the actual values
set at the Date instance, obtain and set number of days for the intended
month instead of using the rolled-over date.
(cherry picked from commit cd9d1bdf5e3351c929d5b651c009ee17b4d962c4)
Conflicts:
sc/source/core/data/table4.cxx
tools/source/datetime/tdate.cxx
Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c
Reviewed-on: https://gerrit.libreoffice.org/3939
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index cced07c..abc885e 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1245,8 +1245,7 @@ void ScTable::IncDate(double rVal, sal_uInt16
nDayOfMonth, double nStep, FillD
{
aDate.SetMonth((sal_uInt16) nMonth);
aDate.SetYear((sal_uInt16) nYear);
-if ( nDayOfMonth 28 )
-aDate.SetDay( Min( aDate.GetDaysInMonth(), nDayOfMonth
) );
+aDate.SetDay( std::min( Date::GetDaysInMonth( nMonth,
nYear), nDayOfMonth ) );
}
}
break;
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 71cc65f..5d2cb14 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -157,6 +157,13 @@ public:
TOOLS_DLLPUBLIC friend Date operator -( const Date rDate, long nDays
);
TOOLS_DLLPUBLIC friend long operator -( const Date rDate1, const
Date rDate2 );
+/** Obtain number of days in a month of a year.
+
+Internally sanitizes nMonth to values 1 = nMonth = 12, does not
+normalize values.
+ */
+static sal_uInt16 GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
+
/// Internally normalizes values.
static long DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
/// Semantically identical to IsValidDate() member method.
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 9d17ec6..0039d22 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -61,8 +61,7 @@ inline sal_Bool ImpIsLeapYear( sal_uInt16 nYear )
// ---
// All callers must have sanitized or normalized month and year values!
-
-inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
if ( nMonth != 2 )
return aDaysInMonth[nMonth-1];
@@ -75,6 +74,17 @@ inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16
nYear )
}
}
+// static
+sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
+{
+SAL_WARN_IF( nMonth 1 || 12 nMonth, tools, Date::GetDaysInMonth -
nMonth out of bounds nMonth);
+if (nMonth 1)
+nMonth = 1;
+else if (12 nMonth)
+nMonth = 12;
+return ImplDaysInMonth( nMonth, nYear);
+}
+
// ---
long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
@@ -86,7 +96,7 @@ long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth,
sal_uInt16 nYear )
nDays = ((sal_uIntPtr)nYear-1) * 365;
nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i nMonth; i++ )
-nDays += DaysInMonth(i,nYear);
+nDays += ImplDaysInMonth(i,nYear);
nDays += nDay;
return nDays;
}
@@ -127,9 +137,9 @@ static void DaysToDate( long nDays,
while ( bCalc );
rMonth = 1;
-while ( (sal_uIntPtr)nTempDays DaysInMonth( rMonth, rYear ) )
+while ( (sal_uIntPtr)nTempDays ImplDaysInMonth( rMonth, rYear ) )
{
-nTempDays -= DaysInMonth( rMonth, rYear );
+nTempDays -= ImplDaysInMonth( rMonth, rYear );
rMonth++;
}
rDay = (sal_uInt16)nTempDays;
@@ -213,7 +223,7 @@ sal_uInt16 Date::GetDayOfYear() const
Normalize( nDay, nMonth, nYear);
for( sal_uInt16 i = 1; i nMonth; i++ )
- nDay = nDay + ::DaysInMonth( i, nYear ); // += yields a warning on
MSVC, so don't use it
+ nDay = nDay + ::ImplDaysInMonth( i, nYear ); // += yields a warning
on MSVC, so don't use it
return nDay;
}
@@ -318,7
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/svdraw/svdundo.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9fbc213ac882540b4d267d11d29eda68df297f16 Author: Michael Stahl mst...@redhat.com Date: Fri May 17 13:23:34 2013 +0200 fdo#62965: fix crash in Edit Contour dialog The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de (cherry picked from commit 71f990d286c603b3bf220c8d93af69f04a45dd7a) Reviewed-on: https://gerrit.libreoffice.org/3936 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index c4e3c29..93cf3fc 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -747,7 +747,7 @@ SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect) nOrdNum=pObj-GetOrdNum(); } -m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel()); +m_pListener = new ObjListListener(*this, *pObj, *pObj-GetModel()); } SdrUndoObjList::~SdrUndoObjList() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] resolved fdo#63805 max day of month of the intended month
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3938 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3938 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] resolved fdo#63805 max day of month of the intended month
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3939 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3939 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#62965: fix crash in Edit Contour dialog
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3936 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3936 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svx/source
svx/source/svdraw/svdundo.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 401483d09d057e06cd9530e2ac53b4325caca577 Author: Michael Stahl mst...@redhat.com Date: Fri May 17 13:23:34 2013 +0200 fdo#62965: fix crash in Edit Contour dialog The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de (cherry picked from commit 71f990d286c603b3bf220c8d93af69f04a45dd7a) Reviewed-on: https://gerrit.libreoffice.org/3940 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 52e4f11..c01aa9b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -732,7 +732,7 @@ SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect) nOrdNum=pObj-GetOrdNum(); } -m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel()); +m_pListener = new ObjListListener(*this, *pObj, *pObj-GetModel()); } SdrUndoObjList::~SdrUndoObjList() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/dialog/_contdlg.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 253871bca7d5f8085424bf920eb781596dc0371e
Author: Michael Stahl mst...@redhat.com
Date: Fri May 17 14:02:25 2013 +0200
fdo#57079: SvxSuperContourDlg: unregister configuration listener
... in destructor. Otherwise it will access freed memory when
eventually called. This crashes since OOo 3.2 but no idea why it would
appear to not crash in earlier versions.
Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
(cherry picked from commit fc63700181ab0f42eab5f98328074fe1682344f8)
Reviewed-on: https://gerrit.libreoffice.org/3937
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index d6e77a2..94277ec 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -265,6 +265,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings
*_pBindings, SfxChildWindow
SvxSuperContourDlg::~SvxSuperContourDlg()
{
+SvtMiscOptions aMiscOptions;
+aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
}
// Resize methods
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - officecfg/registry sd/source sd/util
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 10 +- sd/source/ui/framework/factories/TaskPanelFactory.cxx |2 +- sd/util/sd.component|3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) New commits: commit 4890d321c028800c532fbc254a112b7378a837c8 Author: Michael Meeks michael.me...@suse.com Date: Fri May 17 14:16:52 2013 +0100 update to names of new URLs. diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index 5aa630a..d5df8ff 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -825,7 +825,7 @@ valuetrue/value /prop /node - node oor:name=private:resource/toolpanel/DrawingFramework/MasterPages oor:op=replace + node oor:name=private:resource/toolpanel/MasterPages oor:op=replace prop oor:name=Visible oor:type=xs:boolean valuefalse/value /prop @@ -836,7 +836,7 @@ valueprivate:commandimage/PresentationLayout/value /prop /node - node oor:name=private:resource/toolpanel/DrawingFramework/Layouts oor:op=replace + node oor:name=private:resource/toolpanel/Layouts oor:op=replace prop oor:name=Visible oor:type=xs:boolean valuefalse/value /prop @@ -847,7 +847,7 @@ valueprivate:commandimage/ModifyPage/value /prop /node - node oor:name=private:resource/toolpanel/DrawingFramework/TableDesign oor:op=replace + node oor:name=private:resource/toolpanel/TableDesign oor:op=replace prop oor:name=Visible oor:type=xs:boolean valuefalse/value /prop @@ -858,7 +858,7 @@ valueprivate:commandimage/InsertTable/value /prop /node - node oor:name=private:resource/toolpanel/DrawingFramework/CustomAnimations oor:op=replace + node oor:name=private:resource/toolpanel/CustomAnimations oor:op=replace prop oor:name=Visible oor:type=xs:boolean valuefalse/value /prop @@ -869,7 +869,7 @@ valueprivate:commandimage/CustomAnimation/value /prop /node - node oor:name=private:resource/toolpanel/DrawingFramework/SlideTransitions oor:op=replace + node oor:name=private:resource/toolpanel/SlideTransitions oor:op=replace prop oor:name=Visible oor:type=xs:boolean valuefalse/value /prop diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index b8e7e79..af80933 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -218,7 +218,7 @@ ReferenceXResource SAL_CALL TaskPanelFactory::createResource ( if ( pToolPanel != NULL ) xResource = new TaskPanelResource( rxResourceId ); -OSL_POSTCOND( xResource.is(), TaskPanelFactory::createResource: did not find the given resource! ); +OSL_POSTCOND( xResource.is(), TaskPanelFactory::createResource: did not find the given resource: ' sPaneURL ' ); } } diff --git a/sd/util/sd.component b/sd/util/sd.component index ff6d79c..552e2d5 100644 --- a/sd/util/sd.component +++ b/sd/util/sd.component @@ -81,6 +81,9 @@ implementation name=com.sun.star.comp.draw.SdHtmlOptionsDialog service name=com.sun.star.ui.dialog.FilterOptionsDialog/ /implementation + implementation name=com.sun.star.comp.drawing.ToolPanelFactory +service name=com.sun.star.drawing.DefaultToolPanelFactory/ + /implementation implementation name=com.sun.star.comp.sd.InsertSlideController service name=com.sun.star.frame.ToolbarController/ /implementation ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svx/source
svx/source/dialog/_contdlg.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c04dc880044ca84b80bb13ac900de84ceae2a561
Author: Michael Stahl mst...@redhat.com
Date: Fri May 17 14:02:25 2013 +0200
fdo#57079: SvxSuperContourDlg: unregister configuration listener
... in destructor. Otherwise it will access freed memory when
eventually called. This crashes since OOo 3.2 but no idea why it would
appear to not crash in earlier versions.
Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
(cherry picked from commit fc63700181ab0f42eab5f98328074fe1682344f8)
Reviewed-on: https://gerrit.libreoffice.org/3941
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index ddc11ed..39f6325 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -283,6 +283,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings
*_pBindings, SfxChildWindow
SvxSuperContourDlg::~SvxSuperContourDlg()
{
+SvtMiscOptions aMiscOptions;
+aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
}
// Resize methods
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-3-6] fdo#62965: fix crash in Edit Contour dialog
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3940 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#57079: SvxSuperContourDlg: unregister configuration list...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3937 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#57079: SvxSuperContourDlg: unregister configuration list...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3941 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3941 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst libcdr/ExternalPackage_libcdr.mk libcdr/libcdr-0.0.13.patch libcdr/UnpackedTarball_cdr.mk
download.lst |4 ++-- libcdr/ExternalPackage_libcdr.mk |8 libcdr/UnpackedTarball_cdr.mk|6 -- libcdr/libcdr-0.0.13.patch | 12 4 files changed, 6 insertions(+), 24 deletions(-) New commits: commit b3cef81b7891a68c7365c71b9f00ac4458a3f3a9 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri May 17 14:29:27 2013 +0200 Uploading new libcdr 0.0.14 (cherry picked from commit 0f28a2a5e29499b62074dad4442fafa57858677d) Conflicts: download.lst libcdr/UnpackedTarball_libcdr.mk libcdr/libcdr-0.0.13.patch Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 Reviewed-on: https://gerrit.libreoffice.org/3942 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/download.lst b/download.lst index 657a418..aa1f98c 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00 -export CDR_TARBALL := libcdr-0.0.13.tar.bz2 +CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 +export CDR_TARBALL := libcdr-0.0.14.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index d032e8f..b163eed 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -10,10 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ - src/lib/libcdr.h \ - src/lib/CDRDocument.h \ - src/lib/CDRStringVector.h \ - src/lib/CMXDocument.h \ + inc/libcdr/libcdr.h \ + inc/libcdr/CDRDocument.h \ + inc/libcdr/CDRStringVector.h \ + inc/libcdr/CMXDocument.h \ )) $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index a4a427d..be1e7d7 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-0.0.13.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-0.0.13.patch b/libcdr/libcdr-0.0.13.patch deleted file mode 100644 index 29b2b28..000 --- a/libcdr/libcdr-0.0.13.patch +++ /dev/null @@ -1,12 +0,0 @@ a/src/lib/CDRParser.cpp -+++ b/src/lib/CDRParser.cpp -@@ -32,6 +32,9 @@ - #include string.h - #include sstream - #include set -+#ifndef BOOST_ALL_NO_LIB -+#define BOOST_ALL_NO_LIB 1 -+#endif - #include boost/property_tree/json_parser.hpp - #include boost/property_tree/ptree.hpp - #include boost/spirit/include/classic.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcdr/ExternalProject_libcdr.mk
libcdr/ExternalProject_libcdr.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ceae4287310af986454ed12ade47371cb98c536d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri May 17 14:29:43 2013 +0200 Make libcdr build a little bit less verbose (cherry picked from commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1) Conflicts: libcdr/ExternalProject_libcdr.mk Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 Reviewed-on: https://gerrit.libreoffice.org/3943 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index d7e7693..56378ab 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -73,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --without-docs \ --disable-debug \ --disable-werror \ + --disable-weffc \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - sd/source
sd/source/ui/framework/factories/TaskPanelFactory.cxx |2 -
sd/source/ui/framework/tools/FrameworkHelper.cxx | 27 +++---
2 files changed, 24 insertions(+), 5 deletions(-)
New commits:
commit 010a7177cd65bdbe967eb7b4ed0ba9b8dabc0e5c
Author: Michael Meeks michael.me...@suse.com
Date: Fri May 17 15:47:32 2013 +0100
get the right service names.
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index af80933..750df6a 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -218,7 +218,7 @@ ReferenceXResource SAL_CALL
TaskPanelFactory::createResource (
if ( pToolPanel != NULL )
xResource = new TaskPanelResource( rxResourceId );
-OSL_POSTCOND( xResource.is(), TaskPanelFactory::createResource:
did not find the given resource: ' sPaneURL ' );
+OSL_POSTCOND( xResource.is(), TaskPanelFactory::createResource:
did not find the given resource!);
}
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 1f91f17..b2cbf1f 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -19,6 +19,10 @@
#include osl/time.h
+#include comphelper/processfactory.hxx
+#include comphelper/configuration.hxx
+#include officecfg/Office/Common.hxx
+
#include framework/FrameworkHelper.hxx
#include framework/ConfigurationController.hxx
@@ -610,6 +614,21 @@ ReferenceXResourceId
FrameworkHelper::RequestSidebarPanel (
const OUString rsTaskPanelURL,
const bool bEnsureTaskPaneIsVisible)
{
+// MMeeks ...
+bool bSidebar = false;
+try {
+bSidebar = officecfg::Office::Common::Misc::ExperimentalSidebar::get(
+comphelper::getProcessComponentContext());
+} catch (const uno::Exception e) {
+SAL_WARN(sd, don't have experimental sidebar option installed);
+}
+
+OUString aViewURL, aPaneURL;
+aViewURL = bSidebar ? FrameworkHelper::msSidebarViewURL :
+ FrameworkHelper::msTaskPaneURL;
+aPaneURL = bSidebar ? FrameworkHelper::msSidebarPaneURL :
+ FrameworkHelper::msRightPaneURL;
+
try
{
if (mxConfigurationController.is())
@@ -621,7 +640,7 @@ ReferenceXResourceId FrameworkHelper::RequestSidebarPanel
(
mxConfigurationController-getCurrentConfiguration());
if (xConfiguration.is())
if ( ! xConfiguration-hasResource(
-CreateResourceId(msSidebarViewURL,
msSidebarPaneURL)))
+CreateResourceId(aViewURL, aPaneURL)))
{
// Task pane is not active. Do not force it.
return NULL;
@@ -631,12 +650,12 @@ ReferenceXResourceId
FrameworkHelper::RequestSidebarPanel (
// Create the resource id from URLs for the sidebar pane
// and view and the requested panel.
mxConfigurationController-requestResourceActivation(
-CreateResourceId(msSidebarPaneURL),
+CreateResourceId(aPaneURL),
ResourceActivationMode_ADD);
mxConfigurationController-requestResourceActivation(
-CreateResourceId(msSidebarViewURL, msSidebarPaneURL),
+CreateResourceId(aViewURL, aPaneURL),
ResourceActivationMode_REPLACE);
-ReferenceXResourceId xPanelId (CreateResourceId(rsTaskPanelURL,
msSidebarViewURL, msSidebarPaneURL));
+ReferenceXResourceId xPanelId (CreateResourceId(rsTaskPanelURL,
aViewURL, aPaneURL));
mxConfigurationController-requestResourceActivation(
xPanelId,
ResourceActivationMode_REPLACE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [comment] fdo#37222 and fdo#37219 Open pdf after Export and added to ...
Anurag Kanungo wrote: I am confused a little bit about the bug 37219 Add exported PDF files to recent documents that here we are talking about the recent documents of the operating system (File manager) , not of the LO file menu . Am i right ??? Hi Anurag, hah - you're right, I should read more carefully! :) Whether i include bug 37219 fix in my git commit comment or not, as i think it is resolved ? So, please exactly tell me about the bug 37219 . So - since you're fixing 37222, and the recently-used.xbel is updated only coincidentally, and only if the options is enabled - I'd at least state it as such in 37219. What the submitter probably had in mind is to add an entry into recently-used.xbel unconditionally. ;) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - boost/boost.libcdr.warnings.patch.1 boost/UnpackedTarball_boost.mk
boost/UnpackedTarball_boost.mk |1
boost/boost.libcdr.warnings.patch.1 | 694
2 files changed, 695 insertions(+)
New commits:
commit 11d2e8e03bafb4b256094194f5047764f5665868
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri May 17 16:04:07 2013 +0200
Silence a bit libcdr build
Change-Id: I9bae7d0ea71072168ba53d7376e816bcd05722fa
(cherry picked from commit 6389bf38961d84fd3e1c8fbdc78040e1b1be3ba9)
Reviewed-on: https://gerrit.libreoffice.org/3944
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index b7c22f5..0682306 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -35,6 +35,7 @@ boost_patches += boost.7774.warnings.patch.1
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
+boost_patches += boost.libcdr.warnings.patch.1
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
ifeq (GCC,$(COM))
diff --git a/boost/boost.libcdr.warnings.patch.1
b/boost/boost.libcdr.warnings.patch.1
new file mode 100644
index 000..2df0e3b
--- /dev/null
+++ b/boost/boost.libcdr.warnings.patch.1
@@ -0,0 +1,694 @@
+--- boost/boost/archive/basic_archive.hpp 2010-08-11 20:15:46.0
+0200
boost/boost/archive/basic_archive.hpp 2013-05-17 15:39:58.62469
+0200
+@@ -54,7 +54,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const base_type () const {
++operator base_type () const {
+ return t;
+ }
+ // used for text input
+@@ -90,7 +90,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const base_type () const {
++operator base_type () const {
+ return t;
+ }
+ // used for text intput
+@@ -127,7 +127,7 @@
+ }
+
+ // used for text output
+-operator const int () const {
++operator int () const {
+ return t;
+ }
+ // used for text input
+@@ -161,7 +161,7 @@
+ return *this;
+ }
+ // used for text output
+-operator const uint_least32_t () const {
++operator uint_least32_t () const {
+ return t;
+ }
+ // used for text input
+@@ -254,7 +254,7 @@
+ #define BOOST_ARCHIVE_STRONG_TYPEDEF(T, D) \
+ class D : public T { \
+ public:\
+-explicit D(const T t) : T(t){} \
++explicit D(const T t_) : T(t_){} \
+ }; \
+ /**/
+
+--- boost/boost/multi_index/detail/index_matcher.hpp 2008-07-03
18:51:53.0 +0200
boost/boost/multi_index/detail/index_matcher.hpp 2013-05-17
15:30:12.539099597 +0200
+@@ -132,17 +132,17 @@
+ entries(),entries()+size_,
+ entry(node),entry::less_by_node()); /* localize entry */
+ ent-ordered=false;
+-std::size_t n=ent-pos; /* get its position */
++std::size_t n_=ent-pos; /* get its position */
+
+ entry dummy(0);
+-dummy.pile_top=n;
++dummy.pile_top=n_;
+
+ entry* pile_ent=/* find the first available pile
*/
+ std::lower_bound( /* to stack the entry
*/
+ entries(),entries()+num_piles,
+ dummy,entry::less_by_pile_top());
+
+-pile_ent-pile_top=n; /* stack the entry */
++pile_ent-pile_top=n_; /* stack the entry */
+ pile_ent-pile_top_entry=ent;
+
+ /* if not the first pile, link entry to top of the preceding pile */
+@@ -164,7 +164,7 @@
+*/
+
+ entry* ent=entries()[num_piles-1].pile_top_entry;
+- for(std::size_t n=num_piles;n--;){
++ for(std::size_t n_=num_piles;n_--;){
+ ent-ordered=true;
+ ent=ent-previous;
+ }
+--- boost/boost/multi_index/ordered_index.hpp 2010-07-25 12:44:55.0
+0200
boost/boost/multi_index/ordered_index.hpp 2013-05-17 15:33:42.785182819
+0200
+@@ -436,9 +436,9 @@
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+ iterator find(
+-const CompatibleKey x,const CompatibleCompare comp)const
++const CompatibleKey x,const CompatibleCompare comp_)const
+ {
+-return make_iterator(ordered_index_find(root(),header(),key,x,comp));
++return make_iterator(ordered_index_find(root(),header(),key,x,comp_));
+ }
+
+ templatetypename CompatibleKey
+@@ -448,9 +448,9 @@
+ }
+
+ templatetypename CompatibleKey,typename CompatibleCompare
+- size_type count(const CompatibleKey x,const CompatibleCompare comp)const
++ size_type count(const CompatibleKey x,const CompatibleCompare comp_)const
+ {
+-std::pairiterator,iterator p=equal_range(x,comp);
++std::pairiterator,iterator
[PUSHED libreoffice-4-0] Uploading new libcdr 0.0.14
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3942 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3942 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Make libcdr build a little bit less verbose
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3943 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3943 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Silence a bit libcdr build
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3944 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3944 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bae7d0ea71072168ba53d7376e816bcd05722fa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: 3 commits - doc-dump.py src/docstream.py
doc-dump.py |4 +--
src/docstream.py | 66 +--
2 files changed, 66 insertions(+), 4 deletions(-)
New commits:
commit ea28062eb49560c8917d19d6e20152d851858e6e
Author: Miklos Vajna vmik...@suse.cz
Date: Fri May 17 16:57:51 2013 +0200
give usable error message on ole-based ww6 input
diff --git a/src/docstream.py b/src/docstream.py
index a94d0d3..5c024fe 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -187,6 +187,9 @@ class WordDocumentStream(DOCDirStream):
self.printAndSet(wIdent, self.readuInt16())
self.printAndSet(nFib, self.readuInt16())
+if self.nFib = 0x65 and self.nFib = 0x69:
+print 'todo what=handle nFib 0x65..0x69: ww6 syntax/'
+ret = False
self.printAndSet(unused, self.readuInt16())
self.printAndSet(lid, self.readuInt16())
self.printAndSet(pnNext, self.readuInt16())
commit 0af1cd44f27a2f93ebcaa9265ad3e4f92107d2a3
Author: Miklos Vajna vmik...@suse.cz
Date: Fri May 17 15:29:16 2013 +0200
doc: use gsf to read the ole streams when it's available
The GSF parser can deal with e.g. fdo33590-1.doc
diff --git a/doc-dump.py b/doc-dump.py
index 17aec51..b99d6fe 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -19,10 +19,10 @@ class DOCDumper:
def dump(self):
file = open(self.filepath, 'rb')
-strm = docstream.DOCFile(file.read(), self.params)
+strm = docstream.createDOCFile(file.read(), self.params)
file.close()
dirnames = strm.getDirectoryNames()
-print '?xml version=1.0?\nstreams'
+print '?xml version=1.0?\nstreams ole-type=%s' % strm.getName()
for dirname in dirnames:
if len(dirname) == 0 or dirname in ['Root Entry']:
continue
diff --git a/src/docstream.py b/src/docstream.py
index e9a674f..a94d0d3 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -6,6 +6,7 @@
#
import ole
+import ctypes
import struct
from docdirstream import DOCDirStream
import docrecord
@@ -54,6 +55,58 @@ class DOCFile:
else:
return DOCDirStream(bytes, self.params, name, doc=self)
+def getName(self):
+return native
+
+class GsfDOCFile(DOCFile):
+Same as DOCFile, but uses gsf to read the OLE streams.
+def __init__ (self, chars, params, gsf):
+self.gsf = gsf
+DOCFile.__init__(self, chars, params)
+
+def initWW8(self):
+self.streams = {}
+self.gsf.gsf_init()
+gsfInput = self.gsf.gsf_input_memory_new(self.chars, len(self.chars),
False)
+gsfInfile = self.gsf.gsf_infile_msole_new(gsfInput)
+for i in range(self.gsf.gsf_infile_num_children(gsfInfile)):
+child = self.gsf.gsf_infile_child_by_index(gsfInfile, i)
+childName =
ctypes.string_at(self.gsf.gsf_infile_name_by_index(gsfInfile,i))
+childSize = self.gsf.gsf_input_size(child)
+childData =
+while True:
+bufSize = 1024
+pos = self.gsf.gsf_input_tell(child)
+if pos == childSize:
+break
+elif pos + bufSize childSize:
+bufSize = childSize - pos
+childData += ctypes.string_at(self.gsf.gsf_input_read(child,
bufSize, None), bufSize)
+self.streams[childName] = childData
+self.gsf.gsf_shutdown()
+
+def getDirectoryNames(self):
+return self.streams.keys()
+
+def getDirectoryStreamByName(self, name):
+return self.getStreamFromBytes(name, self.streams[name])
+
+def getName(self):
+return gsf
+
+def createDOCFile(chars, params):
+hasGsf = True
+try:
+gsf = ctypes.cdll.LoadLibrary('libgsf-1.so')
+gsf.gsf_input_read.restype = ctypes.c_void_p
+except:
+hasGsf = False
+
+if hasGsf:
+return GsfDOCFile(chars, params, gsf)
+else:
+return DOCFile(chars, params)
+
class TableStream(DOCDirStream):
def __init__(self, bytes, params, name, doc):
DOCDirStream.__init__(self, bytes, params, name, doc = doc)
commit a2522a47ae8ea503130e8e662d630a47cbdb5d95
Author: Miklos Vajna vmik...@suse.cz
Date: Fri May 17 15:08:47 2013 +0200
doc: refactor to separate code that is specific to our own ole parser
diff --git a/src/docstream.py b/src/docstream.py
index e888299..e9a674f 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -20,8 +20,7 @@ class DOCFile:
self.params = params
if ord(self.chars[0]) == 0xD0 and ord(self.chars[1]) == 0xCF and
ord(self.chars[2]) == 0x11 and ord(self.chars[3]) == 0xE0:
-self.header = ole.Header(self.chars, self.params)
-self.pos = self.header.parse()
+self.initWW8()
else:
print '?xml version=1.0?'
if ord(self.chars[0]) == 0xDB and ord(self.chars[1]) == 0xA5:
@@ -30,6 +29,10 @@ class DOCFile:
[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Views.xcu |6 -- 1 file changed, 6 deletions(-) New commits: commit c23fd923a93ca0acabe9a8fd392032c7bac312d4 Author: Michael Meeks michael.me...@suse.com Date: Fri May 17 16:14:11 2013 +0100 don't throw up the sidebar on start. diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu index 81f56d2..bd3a06b 100644 --- a/officecfg/registry/data/org/openoffice/Office/Views.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu @@ -24,11 +24,5 @@ valuefalse/value /prop /node -!-- show Sidebar child window by default - oor:name == SID_SIDEBAR -- -node oor:name=10336 oor:op=replace - prop oor:name=Visible oor:type=xs:boolean -valuetrue/value - /prop -/node /node /oor:component-data ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - sd/sdi
sd/sdi/ToolPanelViewShell.sdi | 122 ++
1 file changed, 122 insertions(+)
New commits:
commit 9f306e778428ce1510ee835ea8ac46d964e87393
Author: Michael Meeks michael.me...@suse.com
Date: Fri May 17 16:23:07 2013 +0100
re-add removed file.
diff --git a/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi
new file mode 100644
index 000..34394a2
--- /dev/null
+++ b/sd/sdi/ToolPanelViewShell.sdi
@@ -0,0 +1,122 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+interface MasterPagesSelectorInterface
+{
+SID_TP_APPLY_TO_ALL_SLIDES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_TP_APPLY_TO_SELECTED_SLIDES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_TP_USE_FOR_NEW_PRESENTATIONS
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_TP_SHOW_SMALL_PREVIEW
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_TP_SHOW_LARGE_PREVIEW
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
+SID_TP_EDIT_MASTER
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
+// The copy and paste slots are included here so that they later can be
+// disabled in order to remove them from context menus.
+SID_CUT
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_COPY
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_PASTE
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_DELETE_MASTER_PAGE
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+}
+
+interface TaskPaneLayoutMenuInterface
+{
+SID_TP_APPLY_TO_SELECTED_SLIDES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_INSERTPAGE_LAYOUT_MENU
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
+// The copy and paste slots are included here so that they later can be
+// disabled in order to remove them from context menus.
+SID_CUT
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_COPY
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_PASTE
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+}
+
+shell MasterPagesSelector
+{
+import MasterPagesSelectorInterface[Automation];
+}
+
+shell LayoutMenu
+{
+import TaskPaneLayoutMenuInterface[Automation];
+}
+
+shell ToolPanelViewShell
+{
+}
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk scp2/InstallModule_gnome.mk scp2/source
Repository.mk| 16 scp2/InstallModule_gnome.mk |9 - scp2/source/gnome/file_gnome.scp | 23 --- scp2/source/gnome/module_gnome.scp | 23 --- scp2/source/ooo/file_library_ooo.scp | 35 --- 5 files changed, 8 insertions(+), 98 deletions(-) New commits: commit 33e0e0d843cd9ad0b7e698f9a3273af1ba78aa8c Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Tue May 7 12:56:04 2013 -0300 fdo#60924: autoinstall gnome libraries Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a Reviewed-on: https://gerrit.libreoffice.org/3813 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/Repository.mk b/Repository.mk index 3cbed03..5f0dc59 100644 --- a/Repository.mk +++ b/Repository.mk @@ -233,6 +233,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ +$(if $(ENABLE_EVOAB2),evoab) \ +$(if $(ENABLE_GTK),vclplug_gtk) \ +$(if $(ENABLE_GTK3),vclplug_gtk3) \ +$(if $(ENABLE_GCONF),gconfbe1) \ +$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \ +$(if $(ENABLE_GIO),losessioninstall) \ +$(if $(ENABLE_GIO),ucpgio1) \ +$(if $(ENABLE_GNOMEVFS),ucpgvfs1) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ @@ -390,7 +398,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ calc \ dbp \ dbu \ -evoab \ filtertracer \ log \ MacOSXSpell \ @@ -400,7 +407,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ placeware \ pricing \ protocolhandler \ -qstart_gtk \ rpt \ rptui \ rptxml \ @@ -418,8 +424,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ -vclplug_gtk \ -vclplug_gtk3 \ vclplug_tde \ vclplug_kde \ vclplug_kde4 \ @@ -613,12 +617,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fastsax \ fpicker \ fps_office \ -gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ i18nsearch \ ldapbe2 \ -losessioninstall \ macbe1 \ migrationoo2 \ migrationoo3 \ @@ -636,8 +638,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ syssh \ ucpcmis1 \ ucpext \ -ucpgio1 \ -ucpgvfs1 \ ucptdoc1 \ updatefeed \ vbaevents \ diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 3a8dd51..f631b57 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -12,22 +12,13 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ - ENABLE_EVOAB2 \ - ENABLE_GCONF \ ENABLE_GIO \ ENABLE_GNOMEVFS \ - ENABLE_GTK \ - ENABLE_GTK3 \ ENABLE_LOCKDOWN \ - ENABLE_SYSTRAY_GTK \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\ scp2/source/gnome/file_gnome \ )) -$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\ -scp2/source/gnome/module_gnome \ -)) - # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9f824d8..68f413f 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -26,16 +26,6 @@ / #include macros.inc -#ifdef ENABLE_GIO -STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 ) - -STD_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall) -#endif - -#ifdef ENABLE_GNOMEVFS -STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 ) -#endif - #if (defined ENABLE_GCONF defined ENABLE_LOCKDOWN) || defined ENABLE_GIO File gid_File_Share_Registry_Gnome_Xcd TXT_FILE_BODY; @@ -44,16 +34,3 @@ File gid_File_Share_Registry_Gnome_Xcd Name = gnome.xcd; End #endif - -#ifdef ENABLE_GCONF -STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 ) -#endif - -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_QStart_Gtk -Name = LIBNAME(qstart_gtk); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End -#endif diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 1366762..9f4d0b8 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -39,29 +39,6 @@ Module gid_Module_Optional_Gnome XpdCheckSolaris = SUNWgnome-vfs; #endif Files = ( -#ifdef ENABLE_EVOAB2 - gid_File_Lib_Evoab, -#endif -#ifdef ENABLE_GTK - gid_File_Lib_Fps_Gnome, - gid_File_Lib_Vclplug_Gtk, -#endif -#ifdef ENABLE_GTK3 - gid_File_Lib_Vclplug_Gtk3, -#endif
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 59d6bde4045e928b5d68fb23e3340fa0e48f3e33 Author: Eike Rathke er...@redhat.com Date: Fri May 17 17:23:26 2013 +0200 obtain days in month from non-normalized date, fdo#63805 related Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 87ed67f..d5dfd07 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1360,7 +1360,7 @@ static void ImplDateIncrementMonth( Date rDate, sal_Bool bUp ) } } -sal_uInt16 nDaysInMonth = rDate.GetDaysInMonth(); +sal_uInt16 nDaysInMonth = Date::GetDaysInMonth( rDate.GetMonth(), rDate.GetYear()); if ( rDate.GetDay() nDaysInMonth ) rDate.SetDay( nDaysInMonth ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build problem on OS X 10.6.8
Have you had any success since, or did you give up? Unfortunately I can't help as I build on OS X 10.8... (using the latest Xcode and thus Clang). --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [comment] fdo#37222 and fdo#37219 Open pdf after Export and added to ...
Hi, Unconditionally it would be a little difficult as we would require to add the PDF to recent documents without opening it . and to have a common way for all the platforms like Windows , Linux , Mac Os , would be complicated , we would require to be very careful because it would be tweaking with the OS . I will study more about it . Thanks On Fri, May 17, 2013 at 8:15 PM, Thorsten Behrens t...@documentfoundation.org wrote: Anurag Kanungo wrote: I am confused a little bit about the bug 37219 Add exported PDF files to recent documents that here we are talking about the recent documents of the operating system (File manager) , not of the LO file menu . Am i right ??? Hi Anurag, hah - you're right, I should read more carefully! :) Whether i include bug 37219 fix in my git commit comment or not, as i think it is resolved ? So, please exactly tell me about the bug 37219 . So - since you're fixing 37222, and the recently-used.xbel is updated only coincidentally, and only if the options is enabled - I'd at least state it as such in 37219. What the submitter probably had in mind is to add an entry into recently-used.xbel unconditionally. ;) Cheers, -- Thorsten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#60924: autoinstall gnome libraries
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3813 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3813 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/file_library_ooo.scp |6 -- 1 file changed, 6 deletions(-) New commits: commit 8fc9351f555cecdbb45dbf2752fea0efcaa6e0cd Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri May 17 17:29:34 2013 +0200 We are here already in non MACOSX branch Change-Id: I4196577d1caa24d52f5e734cb0817f2e943f12ed diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5cf30da..03243b8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -639,7 +639,6 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl) #if defined(UNX) ! defined(MACOSX) #ifdef ENABLE_TDE -#ifndef MACOSX File gid_File_Lib_Vclplug_Tde Name = LIBNAME(vclplug_tde); LIB_FILE_BODY; @@ -647,9 +646,7 @@ File gid_File_Lib_Vclplug_Tde Dir = SCP2_OOO_BIN_DIR; End #endif -#endif #ifdef ENABLE_KDE -#ifndef MACOSX File gid_File_Lib_Vclplug_Kde Name = LIBNAME(vclplug_kde); LIB_FILE_BODY; @@ -657,9 +654,7 @@ File gid_File_Lib_Vclplug_Kde Dir = SCP2_OOO_BIN_DIR; End #endif -#endif #ifdef ENABLE_KDE4 -#ifndef MACOSX File gid_File_Lib_Vclplug_Kde4 Name = LIBNAME(vclplug_kde4); LIB_FILE_BODY; @@ -668,7 +663,6 @@ File gid_File_Lib_Vclplug_Kde4 End #endif #endif -#endif #if defined(MACOSX) File gid_File_Lib_AppleRemote ___ 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' - 8f/d3c3ae1938c5ca8e037af70442885847a56992
8f/d3c3ae1938c5ca8e037af70442885847a56992 |1 + 1 file changed, 1 insertion(+) New commits: commit 47d6532f3726acd46fc709fa79d754e722566608 Author: Xisco Fauli aniste...@gmail.com Date: Fri May 17 17:32:31 2013 +0200 Notes added by 'git notes add' diff --git a/8f/d3c3ae1938c5ca8e037af70442885847a56992 b/8f/d3c3ae1938c5ca8e037af70442885847a56992 new file mode 100644 index 000..9f91f4a --- /dev/null +++ b/8f/d3c3ae1938c5ca8e037af70442885847a56992 @@ -0,0 +1 @@ +prefer: 99501a839f6d777c24bc9210787fd14dc3aad67d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: boost/boost.3093.warnings.patch boost/UnpackedTarball_boost.mk
boost/UnpackedTarball_boost.mk |2 ++
boost/boost.3093.warnings.patch | 11 +++
2 files changed, 13 insertions(+)
New commits:
commit d68243cd663e55418831a157615ea588848804bb
Author: Isamu Mogi saturda...@gmail.com
Date: Fri May 17 21:20:29 2013 +0900
Fix warnings by shadowing variables in boost/logic/tribool.hpp
Change-Id: I7d85cdb5e32802ddfd83a350f3daa49348bc18a6
Reviewed-on: https://gerrit.libreoffice.org/3935
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 658fcb0..ba497d0 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -8,6 +8,8 @@
#
boost_patches :=
+#https://svn.boost.org/trac/boost/ticket/3093
+boost_patches += boost.3093.warnings.patch
#https://svn.boost.org/trac/boost/ticket/3780
boost_patches += boost.3780.aliasing.patch
#https://svn.boost.org/trac/boost/ticket/4127
diff --git a/boost/boost.3093.warnings.patch b/boost/boost.3093.warnings.patch
new file mode 100755
index 000..1b2bf6d
--- /dev/null
+++ b/boost/boost.3093.warnings.patch
@@ -0,0 +1,11 @@
+--- misc/boost_1_44_0/boost/logic/tribool.hpp Sun Nov 25 18:07:19 2007
misc/build/boost_1_44_0/boost/logic/tribool.hppFri May 17 12:03:35 2013
+@@ -93,7 +93,7 @@
+*
+* \throws nothrow
+*/
+- tribool(bool value) : value(value? true_value : false_value) {}
++ tribool(bool initial_value) : value(initial_value? true_value :
false_value) {}
+
+ /**
+* Construct a new 3-state boolean value with an indeterminate value.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] obtain days in month from non-normalized date, fdo#63805 rel...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3946 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3946/1 obtain days in month from non-normalized date, fdo#63805 related Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 (cherry picked from commit 59d6bde4045e928b5d68fb23e3340fa0e48f3e33) --- M vcl/source/control/field2.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 725f697..0ecd576 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1365,7 +1365,7 @@ } } -sal_uInt16 nDaysInMonth = rDate.GetDaysInMonth(); +sal_uInt16 nDaysInMonth = Date::GetDaysInMonth( rDate.GetMonth(), rDate.GetYear()); if ( rDate.GetDay() nDaysInMonth ) rDate.SetDay( nDaysInMonth ); } -- To view, visit https://gerrit.libreoffice.org/3946 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] obtain days in month from non-normalized date, fdo#63805 rel...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3947 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/3947/1 obtain days in month from non-normalized date, fdo#63805 related Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 (cherry picked from commit 59d6bde4045e928b5d68fb23e3340fa0e48f3e33) --- M vcl/source/control/field2.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index e625a1f..07992e5 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1387,7 +1387,7 @@ } } -sal_uInt16 nDaysInMonth = rDate.GetDaysInMonth(); +sal_uInt16 nDaysInMonth = Date::GetDaysInMonth( rDate.GetMonth(), rDate.GetYear()); if ( rDate.GetDay() nDaysInMonth ) rDate.SetDay( nDaysInMonth ); } -- To view, visit https://gerrit.libreoffice.org/3947 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix warnings by shadowing variables in boost/logic/tribool.h...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3935 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3935 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d85cdb5e32802ddfd83a350f3daa49348bc18a6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Isamu Mogi saturda...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#37222 and possibly fdo#37219
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3948
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3948/1
fdo#37222 and possibly fdo#37219
Added an checkbox option View PDF after Export in Export as Pdf Dialog Box .
If a user ticks the checkbox , pdf file will be opened after export
else only export will be done .
Goto File Export as PDF Tick the checkbox View PDF after Export
to observe changes .
There is a lot of space in between last checkbox and this ViewPDF checkbox ,
because if we
open impress and check export as pdf , there are more options in the dialog.
If user export PDF and check view PDF after export, the PDF file is added to
recent documents of the OS . ( tested on opensuse)
It will require make dev-install to work properly .
Change-Id: I76611c0e3382e27289d648942a98b092edc430ae
---
M filter/source/pdf/impdialog.cxx
M filter/source/pdf/impdialog.hrc
M filter/source/pdf/impdialog.hxx
M filter/source/pdf/impdialog.src
M filter/source/pdf/pdfexport.cxx
M filter/source/pdf/pdfexport.hxx
M filter/source/pdf/pdffilter.cxx
M officecfg/registry/schema/org/openoffice/Office/Common.xcs
8 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9ddf052..d265328 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -80,6 +80,7 @@
mnMaxImageResolution( 300 ),
mbUseTaggedPDF( sal_False ),
mbExportNotes( sal_True ),
+mbViewPDF( sal_False ),
mbExportNotesPages( sal_False ),
mbUseTransitionEffects( sal_False ),
mbIsSkipEmptyPages( sal_True ),
@@ -192,6 +193,7 @@
if ( mbIsPresentation )
mbExportNotesPages = maConfigItem.ReadBool( ExportNotesPages,
sal_False );
mbExportNotes = maConfigItem.ReadBool( ExportNotes, sal_False );
+mbViewPDF = maConfigItem.ReadBool( ViewPDFAfterExport, sal_False );
mbExportBookmarks = maConfigItem.ReadBool( ExportBookmarks, sal_True );
if ( mbIsPresentation )
@@ -360,6 +362,7 @@
if ( mbIsPresentation )
maConfigItem.WriteBool( ExportNotesPages, mbExportNotesPages );
maConfigItem.WriteBool( ExportNotes, mbExportNotes );
+maConfigItem.WriteBool( ViewPDFAfterExport, mbViewPDF );
maConfigItem.WriteBool( ExportBookmarks, mbExportBookmarks );
if ( mbIsPresentation )
@@ -511,6 +514,7 @@
maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
+maCbViewPDF( this, PDFFilterResId( CB_VIEWPDF ) ),
maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
@@ -624,6 +628,7 @@
maCbExportBookmarks.Check( paParent-mbExportBookmarks );
maCbExportNotes.Check( paParent-mbExportNotes );
+maCbViewPDF.Check( paParent-mbViewPDF);
if ( mbIsPresentation )
{
@@ -668,6 +673,7 @@
paParent-mbReduceImageResolution = maCbReduceImageResolution.IsChecked();
paParent-mnMaxImageResolution =
maCoReduceImageResolution.GetText().toInt32();
paParent-mbExportNotes = maCbExportNotes.IsChecked();
+paParent-mbViewPDF = maCbViewPDF.IsChecked();
if ( mbIsPresentation )
paParent-mbExportNotesPages = maCbExportNotesPages.IsChecked();
paParent-mbExportBookmarks = maCbExportBookmarks.IsChecked();
@@ -702,6 +708,7 @@
paParent-mbExportFormFields = maCbExportFormFields.IsChecked();
paParent-mbEmbedStandardFonts = maCbEmbedStandardFonts.IsChecked();
}
+
paParent-maWatermarkText = maEdWatermark.GetText();
/*
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 03b6d55..938b622 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -87,6 +87,7 @@
#define CB_WATERMARK32
#define FT_WATERMARK33
#define ED_WATERMARK34
+#define CB_VIEWPDF 35
//controls for open options tab page
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 11a3f38..4049d53 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -94,6 +94,7 @@
sal_BoolmbUseTaggedPDF;
sal_Int32 mnPDFTypeSelection;
sal_BoolmbExportNotes;
+sal_BoolmbViewPDF;
sal_BoolmbExportNotesPages;
sal_BoolmbUseTransitionEffects;
sal_BoolmbIsSkipEmptyPages;
@@ -210,6 +211,7 @@
CheckBoxmaCbExportBookmarks;
CheckBoxmaCbExportHiddenSlides;
CheckBox
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - vcl/source
vcl/source/control/field2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 145d46663e2d9872b42cd7d4b8f6f76d672a883f Author: Eike Rathke er...@redhat.com Date: Fri May 17 17:23:26 2013 +0200 obtain days in month from non-normalized date, fdo#63805 related Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 (cherry picked from commit 59d6bde4045e928b5d68fb23e3340fa0e48f3e33) Reviewed-on: https://gerrit.libreoffice.org/3947 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index e625a1f..07992e5 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1387,7 +1387,7 @@ static void ImplDateIncrementMonth( Date rDate, sal_Bool bUp ) } } -sal_uInt16 nDaysInMonth = rDate.GetDaysInMonth(); +sal_uInt16 nDaysInMonth = Date::GetDaysInMonth( rDate.GetMonth(), rDate.GetYear()); if ( rDate.GetDay() nDaysInMonth ) rDate.SetDay( nDaysInMonth ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
