[Libreoffice-commits] core.git: lo.xcent.in
lo.xcent.in |4 1 file changed, 4 insertions(+) New commits: commit 1c5cb060f1503ef6d139a3a0cee2c173d8c60615 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 11 10:19:30 2013 +0200 Poke hole in sandbox for the needs of apple_remote Change-Id: Ie13daf11928a3a15a112626887a4113eed18b5cd diff --git a/lo.xcent.in b/lo.xcent.in index 5e28867..46ee9ab 100644 --- a/lo.xcent.in +++ b/lo.xcent.in @@ -11,6 +11,10 @@ !-- usb needed for the apple_remote thingie... -- keycom.apple.security.device.usb/key true/ + keycom.apple.security.temporary-exception.apple-events/key + array + stringmac.remotecontrols/string + /array keycom.apple.security.print/key true/ /dict ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remmark translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2069
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/2069/1
Remmark translation german - english
This is only partly translated, i do the rest another day.
I hope it helps a lot.
Change-Id: I35d23c9e75d0880df76eaf652fcc9b0fb1bb2112
---
M sw/source/core/layout/frmtool.cxx
1 file changed, 84 insertions(+), 83 deletions(-)
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index f0bafde..0896d2d 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -200,7 +200,7 @@
}
}
-//Fuer Hintergrundgrafiken muss bei Groessenaenderungen ein Repaint her.
+//For each resize of the background graphics is a repaint necessary.
const bool bPrtWidth =
(aPrt.*fnRect-fnGetWidth)() !=
(pFrm-Prt().*fnRect-fnGetWidth)();
const bool bPrtHeight =
@@ -470,12 +470,13 @@
}
else
{
-//Proportionale Anpassung der innenliegenden.
-//1. Wenn der Formatierte kein Fly ist
-//2. Wenn er keine Spalten enthaelt
-//3. Wenn der Fly eine feste Hoehe hat und die Spalten in der
+//Proportional adoption of the internal.
+//1. If the formatted is no Fly
+//2. If he contains no columns
+//3. If the Fly has a fixed hight and the columns
+// are next to be.
// Hoehe danebenliegen.
-//4. niemals bei SectionFrms.
+//4. Never at SectionFrms.
bool bLow;
if( pLay-IsFlyFrm() )
{
@@ -530,25 +531,25 @@
}
}
bNotify = true;
-//TEUER!! aber wie macht man es geschickter?
+//EXPENSIVE!! But how we do it more elegant?
if( bInvaPercent )
pLay-InvaPercentLowers( pLay-Prt().Height() - aPrt.Height()
);
}
if ( pLay-IsTabFrm() )
-//Damit _nur_ der Shatten bei Groessenaenderungen gemalt wird.
+//So that _only_ the shadow is drawn while resizing.
((SwTabFrm*)pLay)-SetComplete();
else
{
const ViewShell *pSh = pLay-getRootFrm()-GetCurrShell();
if( !( pSh pSh-GetViewOptions()-getBrowseMode() ) ||
!(pLay-GetType() (FRM_BODY | FRM_PAGE)) )
-//Damit die untergeordneten sauber retouchiert werden.
-//Problembsp: Flys an den Henkeln packen und verkleinern.
-//Nicht fuer Body und Page, sonst flackerts beim HTML-Laden.
+//Thereby the subordinates are retouched clean.
+//Example problem: Take the Flys with the handles and downsize.
+//Not for body and page, otherwise it flickers when loading HTML.
pLay-SetCompletePaint();
}
}
-//Lower benachrichtigen wenn sich die Position veraendert hat.
+//Notify Lower if the position has changed.
const bool bPrtPos = POS_DIFF( aPrt, pLay-Prt() );
const bool bPos = bPrtPos || POS_DIFF( aFrm, pLay-Frm() );
const bool bSize = pLay-Frm().SSize() != aFrm.SSize();
@@ -559,7 +560,7 @@
if ( bPrtPos )
pLay-SetCompletePaint();
-//Nachfolger benachrichtigen wenn sich die SSize geaendert hat.
+//Inform the Follower if the SSize has changed.
if ( bSize )
{
if( pLay-GetNext() )
@@ -646,8 +647,8 @@
SwViewImp *pImp = pSh ? pSh-Imp() : 0;
if ( !pImp || !pImp-IsAction() || !pImp-GetLayAction().IsAgain() )
{
-//Wenn in der LayAction das IsAgain gesetzt ist kann es sein,
-//dass die alte Seite inzwischen vernichtet wurde!
+//If in the LayAction the IsAgain is set it can be
+//that the old page is destroyed in the meantime!
::Notify( pFly, pOldPage, aFrmAndSpace, aPrt );
// #i35640# - additional notify anchor text frame,
// if Writer fly frame has changed its page
@@ -660,8 +661,8 @@
pFly-ResetNotifyBack();
}
-//Haben sich Groesse oder Position geaendert, so sollte die View
-//das wissen.
+//Have the size or the positon changed,
+//so should the view know this.
SWRECTFN( pFly )
const bool bPosChgd = POS_DIFF( aFrm, pFly-Frm() );
const bool bFrmChgd = pFly-Frm().SSize() != aFrm.SSize();
@@ -784,7 +785,7 @@
pCell = pCell-GetUpper();
OSL_ENSURE( pCell-IsCellFrm(), Where's my cell? );
if ( text::VertOrientation::NONE !=
pCell-GetFmt()-GetVertOrient().GetVertOrient() )
-pCell-InvalidatePrt(); //fuer vertikale Ausrichtung.
+pCell-InvalidatePrt(); //for the vertical allign.
}
// OD 2004-02-26 #i25029#
@@ -838,8 +839,8 @@
if ( pCnt-IsNoTxtFrm() )
[PUSHED] Remmark translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2069 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2069 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35d23c9e75d0880df76eaf652fcc9b0fb1bb2112 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix compile for change to boost 1.53.0 declaring smart point...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2064 Approvals: LibreOffice gerrit bot: Verified Norbert Thiebaud: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2064 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mark Wright markwri...@internode.on.net Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix Resource leak: ddf
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2057 Approvals: LibreOffice gerrit bot: Verified Norbert Thiebaud: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2057 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#39135: Prevent integer overflow update the character d...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2008 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2008 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2070
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/2070/1
Comment translation german - english.
sw/source/ui/wrtsh/delete.cxx
Change-Id: I92487e7474c4e27cee939812edf410e9a26731e7
---
M sw/source/ui/wrtsh/delete.cxx
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 6f6d3aa..d858742 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -83,7 +83,7 @@
}
/*
- Beschreibung: Zeile loeschen
+ Description: Erase the line
*/
@@ -92,7 +92,7 @@
{
SwActContext aActContext(this);
ResetCursorStack();
-// alten Cursor merken
+// remember the old cursor
Push();
ClearMark();
SwCrsrShell::LeftMargin();
@@ -130,7 +130,7 @@
long SwWrtShell::DelLeft()
{
-// wenns denn ein Fly ist, wech damit
+// If it's a Fly, throw it away
int nSelType = GetSelectionType();
const int nCmp = nsSelectionType::SEL_FRM | nsSelectionType::SEL_GRF |
nsSelectionType::SEL_OLE | nsSelectionType::SEL_DRW;
if( nCmp nSelType )
@@ -156,13 +156,13 @@
return 1L;
}
-// wenn eine Selektion existiert, diese loeschen.
+// If a selection exists, erase this
if ( IsSelection() )
{
if( !IsBlockMode() || HasSelection() )
{
-//OS: wieder einmal Basic: SwActContext muss vor
-//EnterStdMode verlassen werden!
+//OS: Once again Basic: SwActContext must be leaved
+//before EnterStdMode!
{
SwActContext aActContext(this);
ResetCursorStack();
@@ -183,7 +183,7 @@
EnterStdMode();
}
-// JP 29.06.95: nie eine davor stehende Tabelle loeschen.
+// JP 29.06.95: never erase a table wich standing in front of.
bool bSwap = false;
const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl();
@@ -234,8 +234,8 @@
long SwWrtShell::DelRight()
{
-// werden verodert, wenn Tabellenselektion vorliegt;
-// wird hier auf nsSelectionType::SEL_TBL umgesetzt.
+// Will be or'ed, if a tableselection exists;
+// will here be implemented on nsSelectionType::SEL_TBL
long nRet = 0;
int nSelection = GetSelectionType();
if(nSelection nsSelectionType::SEL_TBL_CELLS)
@@ -251,13 +251,13 @@
case nsSelectionType::SEL_TXT:
case nsSelectionType::SEL_TBL:
case nsSelectionType::SEL_NUM:
-// wenn eine Selektion existiert, diese loeschen.
+// If a selection exists, erase it.
if( IsSelection() )
{
if( !IsBlockMode() || HasSelection() )
{
-//OS: wieder einmal Basic: SwActContext muss vor
-//EnterStdMode verlassen werden!
+//OS: And once again Basic: SwActContext must be
+//leaved before EnterStdMode !
{
SwActContext aActContext(this);
ResetCursorStack();
@@ -445,9 +445,9 @@
return nRet;
}
/*
- * alle Loeschoperationen sollten mit Find statt mit
- * Nxt-/PrvDelim arbeiten, da letzteren mit Wrap Around arbeiten
- * -- das ist wohl nicht gewuenscht.
+ * All erase operations should work with Find instead with
+ * Nxt-/PrvDelim, because the latter works with Wrap Around
+ * -- that's probably not wished.
*/
--
To view, visit https://gerrit.libreoffice.org/2070
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92487e7474c4e27cee939812edf410e9a26731e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2071
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/2071/1
Comment translation german - english
Translation.
Change-Id: I07d8f85437ce6ff59ac40970de29cc2fccde3d5a
---
M sw/sdi/docsh.sdi
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 2c8a9e9..83253dc 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -21,7 +21,7 @@
uuid = 0D960120-111C-101D-9757-6E74207A7520
]
{
-// Slots, die nicht in der WebDocShell gebraucht werden
+// Slots, wich are not needed in the WebDocShell
FN_OUTLINE_TO_IMPRESS
[
--
To view, visit https://gerrit.libreoffice.org/2071
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07d8f85437ce6ff59ac40970de29cc2fccde3d5a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2072
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2072/1
Comment translation german - english
This times i have more files with few translations.
Change-Id: I5a6cb89a36b8fab3db8cfb4029316e51834445b6
---
M sw/sdi/tabsh.sdi
M sw/sdi/textsh.sdi
M sw/sdi/viewsh.sdi
M sw/sdi/wdocsh.sdi
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index cb2f2b1..3f78944 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -21,8 +21,8 @@
uuid = 49CE7CA0-111A-101D-9757-6E74207A7520
]
{
-// hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
-// nicht unterstuetzt werden
+// Here should the slots be integrated, which are not supported
+// in StarWriter/WEB
import TextSelection;
diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi
index e6cd93c..b817536 100644
--- a/sw/sdi/textsh.sdi
+++ b/sw/sdi/textsh.sdi
@@ -28,8 +28,8 @@
DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
Cachable ;
]
- // hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
- // nicht unterstuetzt werden
+ // Here should the slots be integrated, which are not supported
+ // in StarWriter/WEB
import TextSelection;
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 479a188..e6b4bc3 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -43,7 +43,7 @@
uuid = 09782660-111A-101D-9757-6E74207A7520
]
{
- // Slots, die nicht in der WebDocShell gebraucht werden
+ // Slots, wich are not needed in the WebDocShell
FN_INSERT_OBJ_CTRL
[
ExecMethod = Execute ;
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index 68bfe71..f3d62b9 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -21,7 +21,7 @@
uuid = B47F0DE4-1E1F-11d1-89CA-008029E4B0B1
]
{
-// hier nur Slots, die der vollstaendige Writer nicht braucht
+// here only Slots, which the full Writer doesn't need
SID_SOURCEVIEW
[
ExecMethod = Execute ;
--
To view, visit https://gerrit.libreoffice.org/2072
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a6cb89a36b8fab3db8cfb4029316e51834445b6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2073 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/2073/1 Comment translation german - english And again a litte change... Change-Id: Ia2fe42dc34983755a8ed23d188f41f73be71e5c8 --- M sw/sdi/wtextsh.sdi 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/sdi/wtextsh.sdi b/sw/sdi/wtextsh.sdi index 818f3fd..94af14e 100644 --- a/sw/sdi/wtextsh.sdi +++ b/sw/sdi/wtextsh.sdi @@ -28,8 +28,8 @@ DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; Cachable ; ] -// hier sollen die Slots eingefuegt werden, die n u r vom StarWriter/WEB -// unterstuetzt werden +// Here should the slots are be inserted, but O N L Y those that are supported +// by StarWriter/WEB import TextSelection; } -- To view, visit https://gerrit.libreoffice.org/2073 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2fe42dc34983755a8ed23d188f41f73be71e5c8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2074
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/2074/1
Comment translation german - english
Hope it helps a lot.
Change-Id: If10593f81d4b2a00b8305e955ca7e6a15ed47aff
---
M sw/source/ui/table/tablepg.hxx
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 091754d..618f93a 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -90,9 +90,9 @@
};
/*---
- TabPage Format/Tabelle/Spalten
+ TabPage Format/Table/Columns
- */
-#define MET_FIELDS 6 //Anzahl der verwendeten MetricFields
+#define MET_FIELDS 6 //Number of the used MetricFields
class SwTableColumnPage : public SfxTabPage
{
@@ -110,8 +110,8 @@
SwTwips nMinWidth;
sal_uInt16 nNoOfCols;
sal_uInt16 nNoOfVisibleCols;
-//Breite merken, wenn auf autom. Ausrichtung gestellt wird
-sal_uInt16 aValueTbl[MET_FIELDS];//primaere Zuordnung der
MetricFields
+//Remember the with, when switching to autoalign
+sal_uInt16 aValueTbl[MET_FIELDS];//primary assignment of the
MetricFields
sal_BoolbModified:1;
sal_BoolbModifyTbl:1;
sal_BoolbPercentMode:1;
--
To view, visit https://gerrit.libreoffice.org/2074
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If10593f81d4b2a00b8305e955ca7e6a15ed47aff
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Widget for Calc protect cell tab page
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2075 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/2075/1 Widget for Calc protect cell tab page * Translated some German comments to English (thanks to David E. Jourdain) * Moved tab page .ui from sc/ to cui/ * Disabled FreeResource() in tabpages.cxx (need further understanding of the consequences) * Need to address text alignement on the right Change-Id: I332c263bce7c8f743c60bbe79e23641e9f037474 --- M cui/UI_cui.mk A cui/uiconfig/ui/cellprotectionpage.ui M sc/source/ui/attrdlg/tabpages.cxx M sc/source/ui/inc/attrdlg.hrc M sc/source/ui/inc/tabpages.hxx M sc/source/ui/src/attrdlg.src 6 files changed, 275 insertions(+), 149 deletions(-) diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index db290b7..314e526 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -11,8 +11,10 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/backgroundpage \ + cui/uiconfig/ui/alignement \ cui/uiconfig/ui/borderpage \ cui/uiconfig/ui/charnamepage \ + cui/uiconfig/ui/cellprotectionpage \ cui/uiconfig/ui/colorpage \ cui/uiconfig/ui/gradientpage \ cui/uiconfig/ui/colorconfigwin \ diff --git a/cui/uiconfig/ui/cellprotectionpage.ui b/cui/uiconfig/ui/cellprotectionpage.ui new file mode 100644 index 000..1d2fe5e --- /dev/null +++ b/cui/uiconfig/ui/cellprotectionpage.ui @@ -0,0 +1,215 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkWindow id=window1 +property name=can_focusFalse/property +property name=margin_left6/property +property name=margin_top15/property +property name=border_width6/property +child + object class=GtkGrid id=ProtectionPage +property name=visibleTrue/property +property name=can_focusFalse/property +property name=row_spacing12/property +property name=column_spacing6/property +child + object class=GtkFrame id=FrameProtection +property name=visibleTrue/property +property name=can_focusFalse/property +property name=eventsGDK_EXPOSURE_MASK/property +property name=hexpandTrue/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=protection1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=left_padding12/property +child + object class=GtkGrid id=grid1 +property name=visibleTrue/property +property name=can_focusFalse/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkCheckButton id=checkHideAll +property name=label translatable=yesHide _all/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=has_tooltipTrue/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=always_show_imageTrue/property +property name=inconsistentTrue/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkCheckButton id=checkProtected +property name=label translatable=yes_Protected/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=margin_left25/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=activeTrue/property +property
[PUSHED] fdo#56098 paste special shift options incorrect/incomplete
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1903 Approvals: Noel Power: Verified; Looks good to me, approved LibreOffice gerrit bot: Verified Norbert Thiebaud: -- To view, visit https://gerrit.libreoffice.org/1903 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic84ec07f4e0963ad1759036f1d7cbfa295289375 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2070 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2070 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92487e7474c4e27cee939812edf410e9a26731e7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2071 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2071 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07d8f85437ce6ff59ac40970de29cc2fccde3d5a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2072 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2072 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a6cb89a36b8fab3db8cfb4029316e51834445b6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2073 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2073 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2fe42dc34983755a8ed23d188f41f73be71e5c8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Add support for codesigning on Mac OS X
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2031 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2031 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a25c6b7bfa2047b1cb6bcb913750b1b476124f6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2076
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/2076/1
fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
Stop ImplLayoutArgs::ImplLayoutArgs() to perform
ubidi algo on text by setting TEXT_LAYOUT_BIDI_STRONG flag.
Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04
---
M drawinglayer/source/processor2d/vclprocessor2d.cxx
M editeng/source/editeng/impedit3.cxx
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index aeb83c2..adde6aa 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
-nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
+nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 8108770..4b2155c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4274,18 +4274,13 @@
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16
nPara, sal_uInt16 nIndex )
{
-sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
-bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
-ContentNode* pNode = GetEditDoc().GetObject( nPara );
-short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
-bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4294,21 +4289,18 @@
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
+// Let VCL do CTL checking
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
-if ( !bCTL !bR2L)
+if ( !bR2L )
{
// No CTL/Bidi checking neccessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-// CTL/Bidi checking neccessary
-// Don't use BIDI_STRONG, VCL must do some checks.
-nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
-
-if ( bR2L )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
}
pOutDev-SetLayoutMode( nLayoutMode );
--
To view, visit https://gerrit.libreoffice.org/2076
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39370 - Fixed RTL/LTR and alignment buttons location on ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2077
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/2077/1
fdo#39370 - Fixed RTL/LTR and alignment buttons location on RTL interface
Reversed the location of the RTL and LTR buttons as well as the align right
and align left buttons on the RTL interface. It now matches the LTR interface.
Done from toolboxdocumenthandler instead of modifying 20+ xml files.
Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af
---
M framework/source/fwe/xml/toolboxdocumenthandler.cxx
1 file changed, 17 insertions(+), 0 deletions(-)
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index b57d158..7826ac2 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -423,6 +423,23 @@
aToolbarItemProp[5].Name = m_aIsVisible;
aToolbarItemProp[6].Name = m_aTooltip;
+//fix for fdo#39370
+/// check whether RTL interface or not
+if(Application::GetSettings().GetLayoutRTL()){
+if (aCommandURL.compareTo(.uno:ParaLeftToRight) == 0)
+aCommandURL = .uno:ParaRightToLeft;
+else if (aCommandURL.compareTo(.uno:ParaRightToLeft)
== 0)
+aCommandURL = .uno:ParaLeftToRight;
+else if (aCommandURL.compareTo(.uno:LeftPara) == 0)
+aCommandURL = .uno:RightPara;
+else if (aCommandURL.compareTo(.uno:RightPara) == 0)
+aCommandURL = .uno:LeftPara;
+else if (aCommandURL.compareTo(.uno:AlignLeft) == 0)
+aCommandURL = .uno:AlignRight;
+else if (aCommandURL.compareTo(.uno:AlignRight) == 0)
+aCommandURL = .uno:AlignLeft;
+}
+
aToolbarItemProp[0].Value = aCommandURL;
aToolbarItemProp[1].Value = aHelpURL;
aToolbarItemProp[2].Value = aLabel;
--
To view, visit https://gerrit.libreoffice.org/2077
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Issa Alkurtass ialkurt...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add unittest for fdo#59240
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2078
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/2078/1
add unittest for fdo#59240
Change-Id: Ic287228f578c9ecb0f69a47380c890e337203b31
---
A sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
M sc/qa/unit/data/ods/bug-fixes.ods
M sc/qa/unit/subsequent_filters-test.cxx
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
b/sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
new file mode 100644
index 000..ffd5da6
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
@@ -0,0 +1 @@
+๑.๐๐
diff --git a/sc/qa/unit/data/ods/bug-fixes.ods
b/sc/qa/unit/data/ods/bug-fixes.ods
index b7c0539..f40141b 100644
--- a/sc/qa/unit/data/ods/bug-fixes.ods
+++ b/sc/qa/unit/data/ods/bug-fixes.ods
Binary files differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 09d6373..84f52ef 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -903,6 +903,13 @@
CPPUNIT_ASSERT(!pDBData-HasHeader());
}
+{
+// fdo#59240
+OUString aCSVFileName;
+createCSVPath(bugFix_Sheet4., aCSVFileName);
+testFile(aCSVFileName, pDoc, 3);
+}
+
xDocSh-DoClose();
}
--
To view, visit https://gerrit.libreoffice.org/2078
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic287228f578c9ecb0f69a47380c890e337203b31
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sc_subsequent_filters-test: add bug number
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2079
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/2079/1
sc_subsequent_filters-test: add bug number
from 84ae3c9853b7b90d7b859fd562dabc7b31e8deb8
Change-Id: I1768bfb7a68affe423485eff77b6005abde2e2a7
---
M sc/qa/unit/subsequent_filters-test.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 09d6373..63261f9 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -886,7 +886,7 @@
ScDocument* pDoc = xDocSh-GetDocument();
{
-// fdo
+// fdo#40967
OUString aCSVFileName;
createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM(bugFix_Sheet2.)),
aCSVFileName);
testFile(aCSVFileName, pDoc, 1);
--
To view, visit https://gerrit.libreoffice.org/2079
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1768bfb7a68affe423485eff77b6005abde2e2a7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Fix Resource leak: ddf
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2080 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/2080/1 Fix Resource leak: ddf Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 Reviewed-on: https://gerrit.libreoffice.org/2057 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com --- M setup_native/source/win32/wintools/makecab/parseddf.c 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/setup_native/source/win32/wintools/makecab/parseddf.c b/setup_native/source/win32/wintools/makecab/parseddf.c index cbd9914..cf081e3 100644 --- a/setup_native/source/win32/wintools/makecab/parseddf.c +++ b/setup_native/source/win32/wintools/makecab/parseddf.c @@ -378,6 +378,8 @@ ccab-cbFolderThresh = ccab-cb; ccab-iDisk = 0; +fclose(ddf); + return DDF_OK; } -- To view, visit https://gerrit.libreoffice.org/2080 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] xmlsecurity: remove obsolete tools directory
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1608 Approvals: LibreOffice gerrit bot: Verified David Ostrovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1608 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a1df11c18eb5932651ee381fae29f2ac0697b6a Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sdremote : Remove pointer to deleted RemoteServer on error c...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2081
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/2081/1
sdremote : Remove pointer to deleted RemoteServer on error case
Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
---
M sd/source/ui/remotecontrol/Server.cxx
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 76b4dd7..a4dd53a 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -80,18 +80,21 @@
if (!xContext.is() ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
SAL_INFO(sdremote, not in experimental mode, disabling TCP server);
+spServer = NULL;
return;
}
osl::SocketAddr aAddr( 0, PORT );
if ( !mSocket.bind( aAddr ) )
{
SAL_WARN( sdremote, bind failed mSocket.getErrorAsString() );
+spServer = NULL;
return;
}
if ( !mSocket.listen(3) )
{
SAL_WARN( sdremote, listen failed mSocket.getErrorAsString() );
+spServer = NULL;
return;
}
while ( true )
@@ -101,6 +104,7 @@
if ( mSocket.acceptConnection( aSocket ) == osl_Socket_Error )
{
SAL_WARN( sdremote, accept failed
mSocket.getErrorAsString() );
+spServer = NULL;
return; // Closed, or other issue.
}
BufferedStreamSocket *pSocket = new BufferedStreamSocket( aSocket);
--
To view, visit https://gerrit.libreoffice.org/2081
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converted Insert - Sheet widget.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2082 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2082/1 Converted Insert - Sheet widget. Change-Id: I575c4257fcff1349243cbe54c4558839e6629e81 --- A sc/uiconfig/scalc/ui/insertsheet.ui 1 file changed, 387 insertions(+), 0 deletions(-) diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui new file mode 100644 index 000..545d3e9 --- /dev/null +++ b/sc/uiconfig/scalc/ui/insertsheet.ui @@ -0,0 +1,387 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Insert Sheet +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkRadioButton id=radiobutton1 +property name=label translatable=yesB_efore current sheet/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property +
[PATCH] Comment translation german - english - correction
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2083 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/2083/1 Comment translation german - english - correction Change-Id: I4aec4bcf67cb2e07a4cf6d1db705438d0b94b5b7 Ooops: the width ! --- M sw/source/ui/table/tablepg.hxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 618f93a..e65a574 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -110,7 +110,7 @@ SwTwips nMinWidth; sal_uInt16 nNoOfCols; sal_uInt16 nNoOfVisibleCols; -//Remember the with, when switching to autoalign +//Remember the width, when switching to autoalign sal_uInt16 aValueTbl[MET_FIELDS];//primary assignment of the MetricFields sal_BoolbModified:1; sal_BoolbModifyTbl:1; -- To view, visit https://gerrit.libreoffice.org/2083 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4aec4bcf67cb2e07a4cf6d1db705438d0b94b5b7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2084 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/2084/1 Comment translation german - english Change-Id: I3af5ce71bb7758ae422e664ce2e0a44b8768134f --- M sw/inc/poolfmt.hrc 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc index 38b522c..4d23941 100644 --- a/sw/inc/poolfmt.hrc +++ b/sw/inc/poolfmt.hrc @@ -21,10 +21,10 @@ #include rcid.hrc // --- -// die Formate +// The Formats // --- -// Zeichenvorlagen: +// Drawing Templates: #define STR_POOLCHR_FOOTNOTE(RC_POOLCHRFMT_BEGIN+ 0) #define STR_POOLCHR_PAGENO (RC_POOLCHRFMT_BEGIN+ 1) #define STR_POOLCHR_LABEL (RC_POOLCHRFMT_BEGIN+ 2) @@ -53,7 +53,7 @@ #define STR_POOLCHR_HTML_DEFINSTANCE(RC_POOLCHRFMT_HTML_BEGIN+ 7) #define STR_POOLCHR_HTML_TELETYPE (RC_POOLCHRFMT_HTML_BEGIN+ 8) -// Rahmen-Vorlagen: +// Frame Templates: #define STR_POOLFRM_FRAME (RC_POOLFRMFMT_BEGIN+ 0) #define STR_POOLFRM_GRAPHIC (RC_POOLFRMFMT_BEGIN+ 1) #define STR_POOLFRM_OLE (RC_POOLFRMFMT_BEGIN+ 2) @@ -63,9 +63,9 @@ #define STR_POOLFRM_LABEL (RC_POOLFRMFMT_BEGIN+ 6) // --- -// die Vorlagen +// The Templates // --- -// Gruppe Text +// Category Text #define STR_POOLCOLL_STANDARD (RC_POOLCOLL_TEXT_BEGIN+ 0) #define STR_POOLCOLL_TEXT (RC_POOLCOLL_TEXT_BEGIN+ 1) #define STR_POOLCOLL_TEXT_IDENT (RC_POOLCOLL_TEXT_BEGIN+ 2) @@ -76,7 +76,7 @@ #define STR_POOLCOLL_CONFRONTATION (RC_POOLCOLL_TEXT_BEGIN+ 7) #define STR_POOLCOLL_MARGINAL (RC_POOLCOLL_TEXT_BEGIN+ 8) -// Untergruppierung Ueberschriften +// Subcategory Headlines #define STR_POOLCOLL_HEADLINE_BASE (RC_POOLCOLL_TEXT_BEGIN+ 9) #define STR_POOLCOLL_HEADLINE1 (RC_POOLCOLL_TEXT_BEGIN+ 10) #define STR_POOLCOLL_HEADLINE2 (RC_POOLCOLL_TEXT_BEGIN+ 11) @@ -89,9 +89,9 @@ #define STR_POOLCOLL_HEADLINE9 (RC_POOLCOLL_TEXT_BEGIN+ 18) #define STR_POOLCOLL_HEADLINE10 (RC_POOLCOLL_TEXT_BEGIN+ 19) -// Gruppe Listen +// Category Lists #define STR_POOLCOLL_NUMBUL_BASE(RC_POOLCOLL_LISTS_BEGIN+ 0) -// Untergruppe Nummerierung +// Subcategory Numbering #define STR_POOLCOLL_NUM_LEVEL1S(RC_POOLCOLL_LISTS_BEGIN+ 1) #define STR_POOLCOLL_NUM_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 2) #define STR_POOLCOLL_NUM_LEVEL1E(RC_POOLCOLL_LISTS_BEGIN+ 3) @@ -113,7 +113,7 @@ #define STR_POOLCOLL_NUM_LEVEL5E(RC_POOLCOLL_LISTS_BEGIN+ 19) #define STR_POOLCOLL_NUM_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 20) -// Untergruppe Aufzaehlung +// Subcategory Enumeration #define STR_POOLCOLL_BUL_LEVEL1S(RC_POOLCOLL_LISTS_BEGIN+ 21) #define STR_POOLCOLL_BUL_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 22) #define STR_POOLCOLL_BUL_LEVEL1E(RC_POOLCOLL_LISTS_BEGIN+ 23) @@ -135,28 +135,28 @@ #define STR_POOLCOLL_BUL_LEVEL5E(RC_POOLCOLL_LISTS_BEGIN+ 39) #define STR_POOLCOLL_BUL_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 40) -// Sonderbereiche -// Untergruppe Header +// Special Areas +// Subcategory Header #define STR_POOLCOLL_HEADER (RC_POOLCOLL_EXTRA_BEGIN+ 0) #define STR_POOLCOLL_HEADERL(RC_POOLCOLL_EXTRA_BEGIN+ 1) #define STR_POOLCOLL_HEADERR(RC_POOLCOLL_EXTRA_BEGIN+ 2) -// Untergruppe Footer +// Subcategroy Footer #define STR_POOLCOLL_FOOTER (RC_POOLCOLL_EXTRA_BEGIN+ 3) #define STR_POOLCOLL_FOOTERL(RC_POOLCOLL_EXTRA_BEGIN+ 4) #define STR_POOLCOLL_FOOTERR(RC_POOLCOLL_EXTRA_BEGIN+ 5) -// Untergruppe Tabelle +// Subcategroy Table #define STR_POOLCOLL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 6) #define STR_POOLCOLL_TABLE_HDLN (RC_POOLCOLL_EXTRA_BEGIN+ 7) -// Untergruppe Labels +// Subcategroy Labels #define STR_POOLCOLL_LABEL (RC_POOLCOLL_EXTRA_BEGIN+ 8) #define STR_POOLCOLL_LABEL_ABB (RC_POOLCOLL_EXTRA_BEGIN+ 9) #define STR_POOLCOLL_LABEL_TABLE(RC_POOLCOLL_EXTRA_BEGIN+ 10) #define STR_POOLCOLL_LABEL_FRAME(RC_POOLCOLL_EXTRA_BEGIN+ 11) -// sonstiges +// Miscellaneous #define STR_POOLCOLL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 12) #define STR_POOLCOLL_FOOTNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 13) #define STR_POOLCOLL_JAKETADRESS(RC_POOLCOLL_EXTRA_BEGIN+ 14) @@ -165,16 +165,16 @@ #define STR_POOLCOLL_LABEL_DRAWING (RC_POOLCOLL_EXTRA_BEGIN+ 17) -// Gruppe Verzeichnisse +// Category Directories #define STR_POOLCOLL_REGISTER_BASE (RC_POOLCOLL_REGISTER_BEGIN+ 0) -// Untergruppe Index-Verzeichnisse +// Subcategory Index-Directories #define STR_POOLCOLL_TOX_IDXH (RC_POOLCOLL_REGISTER_BEGIN+ 1)
[PATCH] Comment translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2085
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2085/1
Comment translation german - english
Change-Id: I752eaaeaa9835efb010da376824b10f25085bede
---
M sw/inc/rcid.hrc
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 9dd0961..96fefd5 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -22,7 +22,7 @@
#define IMAGE_MASK_COLOR Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; }
//
-// Bereiche fuer die UI-Verzeichnisse
+// Areas for the UI-Directories
//
#define RC_BASE RID_SW_START// From solar.hrc
@@ -71,14 +71,14 @@
#define RC_IDXTXT (RC_BASE + 4350)
/*
-Beschreibung: Bereiche ausspannen
+Description: areas unharness
*/
-// App-Verzeichnis
+// App-Directory
#define RC_APP_BEGINRC_APP
#define RC_APP_END (RC_APP_BEGIN + 199)
-// Dialog-Verzeichnis
+// Dialog-Directory
#define RC_DIALOG_BEGIN RC_DIALOG
#define RC_DIALOG_END (RC_DIALOG_BEGIN + 99)
@@ -106,15 +106,15 @@
#define RC_VIEW_BEGIN RC_VIEW
#define RC_VIEW_END (RC_VIEW_BEGIN + 99)
-// Zeichen Absatz Tab-Dialog
+// Character Paragraph Tab-Dialog
#define RC_CHRDLG_BEGIN RC_CHRDLG
#define RC_CHRDLG_END (RC_CHRDLG_BEGIN + 19)
-// Unsere Shell
+// Our Shell
#define RC_WRTSH_BEGIN RC_WRTSH
#define RC_WRTSH_END(RC_WRTSH_BEGIN + 49)
-// Verzeichnisse
+// Directories
#define RC_INDEX_BEGIN RC_INDEX
// RC_INDEX_END(RC_INDEX + 99)
@@ -122,15 +122,15 @@
#define RC_RIBBAR_BEGIN RC_RIBBAR
#define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79)
-// globale Resourcen
+// Global Resources
#define RC_GLOBALS_BEGINRC_GLOBALS
#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)
-// Format-Vorlagen
+// Format-Templates
#define RC_FMTUI_BEGIN RC_FMTUI
#define RC_FMTUI_END(RC_FMTUI_BEGIN + 69)
-// Grafik Dialoge
+// Graphic Dialogues
#define RC_GRFDLG_BEGIN RC_GRFDLG
// RC_GRFDLG_END (RC_GRFDLG_BEGIN + 99)
@@ -138,11 +138,11 @@
#define RC_FSTDLG_BEGIN RC_FSTDLG
// RC_FSTDLG_END (RC_FSTDLG_BEGIN + 99)
-// Rahmen Dialoge
+// Frame Dialogue
#define RC_FRMDLG_BEGIN RC_FRMDLG
#define RC_FRMDLG_END (RC_FRMDLG_BEGIN + 99)
-// Feld Dialoge
+// Field Dialogue
#define RC_FLDDLG_BEGIN RC_FLDDLG
// RC_FLDDLG_END (RC_FLDDLG_BEGIN + 149)
@@ -150,20 +150,20 @@
#define RC_UTLUI_BEGIN RC_UTLUI
#define RC_UTLUI_END(RC_UTLUI + 99)
-// Utilities UI-Attribute
+// Utilities UI-Attributes
#define RC_ATTR_BEGIN RC_ATTR
#define RC_ATTR_END (RC_ATTR + 99)
-// Tabellen
+// Tables
#define RC_TABLE_BEGIN RC_TABLE
#define RC_TABLE_END(RC_TABLE + 99)
-// Konfiguration
+// Configuration
#define RC_CONFIG_BEGIN RC_CONFIG
#define RC_CONFIG_END (RC_CONFIG + 99)
-// Verschiedenes
+// Miscellaneous
#define RC_MISC_BEGIN RC_MISC
#define RC_MISC_END (RC_MISC + 99)
@@ -171,18 +171,18 @@
#define RC_DBUI_BEGIN RC_DBUI
// RC_DBUI_END (RC_DBUI + 99)
-// Der Rest der Imp-Klassen
+// The rest of the Imp-Classes
#define RC_DOCHDL_BEGIN RC_DOCHDL
#define RC_DOCHDL_END (RC_DOCHDL + 99)
-// Zeichenvorlagen
+// Drawing Templates
#define RC_POOLCHRFMT_BEGIN RC_POOLCHRFMT
// RC_POOLCHRFMT_END (RC_POOLCHRFMT + 29)
#define RC_POOLCHRFMT_HTML_BEGINRC_POOLHTMLCHRFMT
// RC_POOLCHRFMT_HTML_END (RC_POOLHTMLCHRFMT+ 30)
-// Rahmenvorlagen
+// Frame-Templates
#define RC_POOLFRMFMT_BEGIN RC_POOLFRMFMT
// RC_POOLFRMFMT_END (RC_POOLFRMFMT + 20)
@@ -202,27 +202,27 @@
#define RC_POOLCOLL_HTML_END(RC_POOLTXTCOLL + 169)
-// Poolvorlagen Seite
+// Pooltemplates Page
#define RC_POOLPAGEDESC_BEGIN RC_POOLPAGEDESC
// RC_POOLPAGEDESC_END (RC_POOLPAGEDESC + 10)
-// Poolvorlagen Numerierung
+// Pooltemplates Numbering
#define RC_POOLNUMRULE_BEGINRC_POOLNUMRULE
// RC_POOLNUMRULE_END (RC_POOLNUMRULE + 10)
// free: STR_POOLPARSTYLE to (STR_POOLPARSTYLE + 9)
-// Envelp-Verzeichnis
+// Envelp-Directory
#define RC_ENVELP_BEGIN (RC_ENVELP )
//
[PATCH] --amend
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2086
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/2086/1
--amend
Change-Id: Ib32b63039b225236d2a6fe55c0b90fdae9bc8fa6
---
M filter/source/msfilter/svdfppt.cxx
M sd/source/filter/ppt/pptin.cxx
M sd/source/filter/ppt/propread.cxx
M sd/source/filter/ppt/propread.hxx
4 files changed, 125 insertions(+), 29 deletions(-)
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 537e5f2..4b202fb 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5048,7 +5048,7 @@
}
}
if ( i )
-aString = OUString( pBuf );
+aString = OUString(pBuf, i);
delete[] pBuf;
}
else if( aTextHd.nRecType == PPT_PST_TextBytesAtom )
@@ -5101,7 +5101,7 @@
}
}
-if ( aString.getLength() )
+if ( !aString.isEmpty() )
{
sal_uInt32 nCharCount;
sal_BoolbTextPropAtom = sal_False;
@@ -5123,7 +5123,7 @@
PPTCharPropSet aCharPropSet( nCurrentPara );
if ( bTextPropAtom )
{
-if( nCharAnzRead == ( nStringLen - 1 ) aString == \r )
+if( nCharAnzRead == ( nStringLen - 1 )
aString[nCharAnzRead] == '\r' )
{
/* n#782833: Seems like the new line character at end of
the para
* has two char properties and we would need to use the
next one.
@@ -5165,7 +5165,7 @@
{
nLen = ( nCurrentSpecMarker 0x ) - nCharAnzRead;
if ( nLen )
-aCharPropSet.maString = aString;
+aCharPropSet.maString = aString.copy(
nCharAnzRead, nLen );
else if ( bEmptyParaPossible )
aCharPropSet.maString = OUString();
if ( nLen || bEmptyParaPossible )
@@ -5181,7 +5181,7 @@
if ( ( nCurrentSpecMarker 0x ) != nCharAnzRead )
{
nLen = ( nCurrentSpecMarker 0x ) -
nCharAnzRead;
-aCharPropSet.maString = aString;
+aCharPropSet.maString = aString.copy(nCharAnzRead,
nLen);
aCharPropList.push_back( new PPTCharPropSet(
aCharPropSet, nCurrentPara ) );
nCharCount -= nLen;
nCharAnzRead += nLen;
@@ -5199,7 +5199,7 @@
}
else
{
-aCharPropSet.maString = aString;
+aCharPropSet.maString = aString.copy(nCharAnzRead, nLen);
aCharPropList.push_back( new PPTCharPropSet( aCharPropSet,
nCurrentPara ) );
nCharAnzRead += nCharCount;
bEmptyParaPossible = sal_False;
@@ -6506,8 +6506,8 @@
{
OUString aString(
pSet-maString );
PPTCharPropSet* pNew =
new PPTCharPropSet( *pSet );
-pSet-maString =
aString;
-pNew-maString =
aString;
+pSet-maString =
aString.copy( 0, nOldLen);
+pNew-maString =
aString.copy( nOldLen, nNewLen);
pNew-mnOriginalTextPos += nOldLen;
aStyleTextPropReader.aCharPropList.insert(
aStyleTextPropReader.aCharPropList.begin() + nI + 1, pNew );
}
@@ -6744,14 +6744,14 @@
if ( (*FE)-nPos == nPos )
{
-if ( aString[(sal_uInt16)nCount]
== 0x2a )
+if ( aString[nCount] == 0x2a )
{
sal_uInt32 nBehind =
aString.getLength() - ( nCount + 1 );
pSet-maString = OUString();
if ( nBehind )
{
PPTCharPropSet* pNewCPS =
new PPTCharPropSet( *pSet );
-pNewCPS-maString =
aString;
+pNewCPS-maString =
aString.copy( nCount + 1, nBehind );
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2074 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2074 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If10593f81d4b2a00b8305e955ca7e6a15ed47aff Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english - correction
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2083 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2083 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4aec4bcf67cb2e07a4cf6d1db705438d0b94b5b7 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2084 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2084 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3af5ce71bb7758ae422e664ce2e0a44b8768134f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2085 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2085 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I752eaaeaa9835efb010da376824b10f25085bede Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] sc_subsequent_filters-test: add bug number
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2079 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2079 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1768bfb7a68affe423485eff77b6005abde2e2a7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2087 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/2087/1 Comment translation german - english Change-Id: Id40b6528515a9ebcf3deb0f84597955723118a15 --- M sw/inc/swtable.hxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 81f2696..fe018f6 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -141,7 +141,7 @@ virtual ~SwTable(); // @@@ public copy ctor, but no copy assignment? -SwTable( const SwTable rTable ); // kein Copy der Lines !! +SwTable( const SwTable rTable ); // no copy of the lines !! private: // @@@ public copy ctor, but no copy assignment? SwTable operator= (const SwTable ); -- To view, visit https://gerrit.libreoffice.org/2087 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id40b6528515a9ebcf3deb0f84597955723118a15 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2088 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2088/1 Comment translation german - english I moved order so git grep '\\(der\|die\|das\)\' sw does not show up this file because of der Change-Id: I98086993cf672806d763520b04e7693c8c772502 --- M sw/inc/swtypes.hxx 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index ad99ac8..1ea929e 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -283,8 +283,8 @@ // for it and sends a PREP_WIDOWS to its predecessor // (Master/Follow). PREP_QUOVADIS, // If a footnote has to be split between two paragraphs -// the last on the page has to receive a QUOVADIS in or- -// der to format the text into it. +// the last on the page has to receive a QUOVADIS in +// order to format the text into it. PREP_BOSS_CHGD, // If a Frm changes its column/page this additional // Prepare is sended to POS_CHGD in MoveFwd/Bwd // (join Ftn-numbers etc.) -- To view, visit https://gerrit.libreoffice.org/2088 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98086993cf672806d763520b04e7693c8c772502 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2089
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/2089/1
Comment translation german - english
Change-Id: Ifc4be6a2253eaf89c996c0c2619b6d71e2fb5b5c
---
M sw/source/core/attr/hints.cxx
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index cd895eb..1db49a4 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -108,7 +108,7 @@
#ifdef DBG_UTIL
void SwAttrSetChg::ClearItem( sal_uInt16 nWhch )
{
-OSL_ENSURE( bDelSet, der Set darf nicht veraendert werden! );
+OSL_ENSURE( bDelSet, The Set may not be changed! );
pChgSet-ClearItem( nWhch );
}
#endif
@@ -121,13 +121,13 @@
// Overhead of SfxPoolItem
int SwMsgPoolItem::operator==( const SfxPoolItem ) const
{
-OSL_FAIL( SwMsgPoolItem kennt kein == );
+OSL_FAIL( SwMsgPoolItem knows no == );
return 0;
}
SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
{
-OSL_FAIL( SwMsgPoolItem kennt kein Clone );
+OSL_FAIL( SwMsgPoolItem knows no Clone );
return 0;
}
--
To view, visit https://gerrit.libreoffice.org/2089
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc4be6a2253eaf89c996c0c2619b6d71e2fb5b5c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2087 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2087 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id40b6528515a9ebcf3deb0f84597955723118a15 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2088 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2088 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98086993cf672806d763520b04e7693c8c772502 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2089 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2089 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc4be6a2253eaf89c996c0c2619b6d71e2fb5b5c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] python3: 15833.patch makes sense with ro /usr on Linux as we...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2090 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/2090/1 python3: 15833.patch makes sense with ro /usr on Linux as well Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad (cherry picked from commit 2b5dd63565509c2e02c193522a85d3dc6b60361d) --- M python3/UnpackedTarball_python3.mk 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index eb07def..d8c0862 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -32,7 +32,7 @@ python3/python-3.3.0-ffi-clang.patch.1 \ )) -ifeq ($(OS),MACOSX) +ifneq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-15833.patch.1 \ )) -- To view, visit https://gerrit.libreoffice.org/2090 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Widget for Calc Protect cell tab page (cont)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2091 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/2091/1 Widget for Calc Protect cell tab page (cont) * Remove commented FreeResource (as indicated by wiki insrtuctions) Change-Id: Ia54da0c1388ca3346f6dc7d4e74c4f73899664a3 --- M sc/source/ui/attrdlg/tabpages.cxx 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 1fe9a9d..b0eca20 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -67,7 +67,6 @@ m_pBtnHideFormula-SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); m_pBtnHidePrint-SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); -//FreeResource(); } // --- -- To view, visit https://gerrit.libreoffice.org/2091 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia54da0c1388ca3346f6dc7d4e74c4f73899664a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2092
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/2092/1
Comment translation german - english
Change-Id: I76c5124ff13abe4610b8cc9a07ba75e038c02e8b
---
M sw/source/core/crsr/crsrsh.cxx
M sw/source/core/crsr/pam.cxx
M sw/source/core/doc/doc.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/doccorr.cxx
M sw/source/core/doc/docdraw.cxx
M sw/source/core/doc/tblrwcl.cxx
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a87677f..e417c92 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2017,7 +2017,7 @@
if( !bBasicHideCrsr )
{
bSVCrsrVis = sal_False;
-// evt. die sel. Bereiche aufheben !!
+// possibly reverse selected areas!!
SET_CURR_SHELL( this );
pVisCrsr-Hide();
}
@@ -2529,7 +2529,7 @@
SwNodes rNds = rDoc.GetNodes();
SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
-SwCntntNode* pCNd = rNds.GoNext( aNodeIdx ); // gehe zum 1. ContentNode
+SwCntntNode* pCNd = rNds.GoNext( aNodeIdx ); // go to the first
ContentNode
pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0
)));
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 505477a..741679e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -667,7 +667,7 @@
if( pFmt-GetProtect().IsCntntProtected() )
{
const SwFmtCntnt rCntnt = pFmt-GetCntnt(sal_False);
-OSL_ENSURE( rCntnt.GetCntntIdx(), wo ist der
SectionNode? );
+OSL_ENSURE( rCntnt.GetCntntIdx(), where is the
SectionNode? );
sal_uLong nIdx = rCntnt.GetCntntIdx()-GetIndex();
if( nSttIdx = nIdx nEndIdx = nIdx
rCntnt.GetCntntIdx()-GetNode().GetNodes().IsDocNodes() )
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 80cfa84..993eefc 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1221,7 +1221,7 @@
bool bHasPostIts = false;
SwFieldType* pFldType = pIDFA-GetSysFldType( RES_POSTITFLD );
-OSL_ENSURE( pFldType, kein PostItType ? );
+OSL_ENSURE( pFldType, no PostItType ? );
if( pFldType-GetDepends() )
{
@@ -1575,7 +1575,7 @@
sal_Int32 i = 0;
for ( i = 1; pStPage i nDocPageCount; ++i )
pStPage = (SwPageFrm*)pStPage-GetNext();
-if ( !pStPage ) // dann wars das
+if ( !pStPage ) // Then it was that
return;
// currently for prospect printing all pages are valid to be printed
@@ -2486,7 +2486,7 @@
return mbLinksUpdated;
}
-// embedded alle lokalen Links (Bereiche/Grafiken)
+// embedded all local links (Areas/Graphics)
static ::sfx2::SvBaseLink* lcl_FindNextRemovableLink( const
::sfx2::SvBaseLinks rLinks, sfx2::LinkManager rLnkMgr )
{
for( sal_uInt16 n = 0; n rLinks.size(); ++n )
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 594b03b..0df87ac 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -497,7 +497,7 @@
for( size_t n = 0; n rData.GetLineCount(); ++n )
{
const CompareLine* pLine = rData.GetLine( n );
-OSL_ENSURE( pLine, wo ist die Line? );
+OSL_ENSURE( pLine, where is the line? );
sal_uLong nH = pLine-GetHashValue();
sal_uLong* pFound = pHashArr[ nH % nPrime ];
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 2379c71..50868ea 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -319,7 +319,7 @@
SwPosition aNewPos(rNewPos);
for( sal_uInt16 n = 0; n rTbl.size(); ++n )
{
-// liegt auf der Position ??
+// lies on the position ??
lcl_PaMCorrRel1( rTbl[ n ], rOldNode.GetNode(), aNewPos,
aNewPos.nContent.GetIndex() + nOffset );
}
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 25a5a4e..c8d9ed3 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -523,7 +523,7 @@
nOrdNum = pContact-GetMaster()-GetOrdNum();
}
else {
-OSL_ENSURE( !this, was ist das fuer ein Format? );
+OSL_ENSURE( !this, what is that for a format? );
}
}
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 9818bde..3635be5 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1214,7 +1214,7 @@
for (size_t n = 0; n aSelBoxes.size(); ++n)
{
SwTableBox* pSelBox = aSelBoxes[n];
-
[PATCH libreoffice-4-0] resorted SvTreeLists munged horribly
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2093 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/2093/1 resorted SvTreeLists munged horribly e.g. tools-options-paths, click the sort icon, reclick it few times and the list doesn't reverse but instead shows the same two entries over and over again. Regression since fb01d8e132ab9097ed30b3bc4c7585622df591ad Change-Id: Ifc151ad72a27f1cdc3141e356ad6d100e6219cc2 (cherry picked from commit dde8e266084c89860a9a91f2a29ac31b730a9c4a) --- M svtools/source/contnr/treelist.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index d0125f4..43968c5 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1583,6 +1583,7 @@ // Recursively sort child entries. ResortChildren(p); } +SetListPositions(pParent-maChildren); // correct list position in target list } void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, -- To view, visit https://gerrit.libreoffice.org/2093 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc151ad72a27f1cdc3141e356ad6d100e6219cc2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add 6 width border to toplevel widgets of printdialog
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2067 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2067 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Fix Resource leak: ddf
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2080 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2080 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2092 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2092 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76c5124ff13abe4610b8cc9a07ba75e038c02e8b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use static/reinterpret_cast and minor rewrite
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2047 Approvals: LibreOffice gerrit bot: Verified Norbert Thiebaud: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2047 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d2f21394c03e29d573dc197da90a91c96d55409 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57422 fixing the Listener for the buttons and scrollbar
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2094
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/2094/1
fdo#57422 fixing the Listener for the buttons and scrollbar
this patch will fix the listener for all buttons and
scrollbars that in presenter console.
Change-Id: Ic30487fc1f4eeef447c9676b94fe6b9e93de8378
---
M sdext/source/presenter/PresenterSlideSorter.cxx
M sdext/source/presenter/PresenterToolBar.cxx
M vcl/unx/gtk/window/gtkframe.cxx
M vcl/win/source/window/salframe.cxx
4 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx
b/sdext/source/presenter/PresenterSlideSorter.cxx
index bdffca4..ffe60c5 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -511,26 +511,14 @@
void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent
rEvent)
throw(css::uno::RuntimeException)
{
-css::awt::MouseEvent rTemp =rEvent;
-/// check whether RTL interface or not
-if(Application::GetSettings().GetLayoutRTL()){
-awt::Rectangle aBox = mxWindow-getPosSize();
-rTemp.X=aBox.Width-rEvent.X;
-}
-const geometry::RealPoint2D aPosition(rTemp.X, rEvent.Y);
+const geometry::RealPoint2D aPosition(rEvent.X, rEvent.Y);
mnSlideIndexMousePressed = mpLayout-GetSlideIndexForPosition(aPosition);
}
void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent
rEvent)
throw(css::uno::RuntimeException)
{
-css::awt::MouseEvent rTemp =rEvent;
-/// check whether RTL interface or not
-if(Application::GetSettings().GetLayoutRTL()){
-awt::Rectangle aBox = mxWindow-getPosSize();
-rTemp.X=aBox.Width-rEvent.X;
-}
-const geometry::RealPoint2D aPosition(rTemp.X, rEvent.Y);
+const geometry::RealPoint2D aPosition(rEvent.X, rEvent.Y);
const sal_Int32 nSlideIndex
(mpLayout-GetSlideIndexForPosition(aPosition));
if (nSlideIndex == mnSlideIndexMousePressed mnSlideIndexMousePressed =
0)
@@ -574,13 +562,7 @@
{
if (mpMouseOverManager.get() != NULL)
{
-css::awt::MouseEvent rTemp =rEvent;
-/// check whether RTL interface or not
-if(Application::GetSettings().GetLayoutRTL()){
-awt::Rectangle aBox = mxWindow-getPosSize();
-rTemp.X=aBox.Width-rEvent.X;
-}
-const geometry::RealPoint2D aPosition(rTemp.X, rEvent.Y);
+geometry::RealPoint2D aPosition(rEvent.X, rEvent.Y);
sal_Int32 nSlideIndex (mpLayout-GetSlideIndexForPosition(aPosition));
if (nSlideIndex 0)
diff --git a/sdext/source/presenter/PresenterToolBar.cxx
b/sdext/source/presenter/PresenterToolBar.cxx
index 76aaa7c..20200f9 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1020,11 +1020,6 @@
const bool bOverWindow,
const bool bMouseDown)
{
-css::awt::MouseEvent rTemp =rEvent;
-if(Application::GetSettings().GetLayoutRTL()){
-awt::Rectangle aWindowBox = mxWindow-getPosSize();
-rTemp.X=aWindowBox.Width-rTemp.X;
-}
ElementContainer::iterator iPart;
ElementContainer::const_iterator iEnd (maElementContainer.end());
for (iPart=maElementContainer.begin(); iPart!=iEnd; ++iPart)
@@ -1038,13 +1033,13 @@
awt::Rectangle aBox ((*iElement)-GetBoundingBox());
const bool bIsOver = bOverWindow
- aBox.X = rTemp.X
- aBox.Width+aBox.X-1 = rTemp.X
- aBox.Y = rTemp.Y
- aBox.Height+aBox.Y-1 = rTemp.Y;
+ aBox.X = rEvent.X
+ aBox.Width+aBox.X-1 = rEvent.X
+ aBox.Y = rEvent.Y
+ aBox.Height+aBox.Y-1 = rEvent.Y;
(*iElement)-SetState(
bIsOver,
-bIsOver rTemp.Buttons!=0 bMouseDown
rTemp.ClickCount0);
+bIsOver rEvent.Buttons!=0 bMouseDown
rEvent.ClickCount0);
}
}
}
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 6343f5b..21bc119 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2967,7 +2967,9 @@
// --- RTL --- (mirror mouse pos)
if( Application::GetSettings().GetLayoutRTL() )
-aEvent.mnX = pThis-maGeometry.nWidth-1-aEvent.mnX;
+// Disable mirroring for presenter console
+if(!(pThis-m_aTitle != pThis-m_bFullscreen))
+aEvent.mnX = pThis-maGeometry.nWidth-1-aEvent.mnX;
vcl::DeletionListener aDel( pThis );
@@ -3031,7 +3033,9 @@
// --- RTL --- (mirror mouse pos)
if( Application::GetSettings().GetLayoutRTL() )
-aEvent.mnX = pThis-maGeometry.nWidth-1-aEvent.mnX;
+// Disable mirroring for presenter console
+if(!(pThis-m_aTitle != pThis-m_bFullscreen))
+aEvent.mnX =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source vcl/uiconfig
vcl/source/window/builder.cxx | 33 -
vcl/uiconfig/ui/printdialog.ui |2 +-
2 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 03ca2a8fde19498e8c584c899877c7332204a082
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 8 15:06:08 2013 +
resolve fdo#60450 - Printer list is missing its border in Print dialog
Reviewed-on: https://gerrit.libreoffice.org/2043
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit f10ba07935951e6c74663a35de9a79b7d66beb37)
Conflicts:
vcl/source/window/builder.cxx
allow a custom border property for drawing areas
(cherry picked from commit e258b760563dc2a69a1cc8b0c8b7b4c15a2774ad)
Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
1e5777e5dcc04d0aa53d1ac4b9091f310ae59035
Reviewed-on: https://gerrit.libreoffice.org/2052
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 68bc434..355b28f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -307,16 +307,16 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader
reader)
namespace
{
-OString extractPattern(VclBuilder::stringmap rMap)
+OString extractCustomProperty(VclBuilder::stringmap rMap)
{
-OString sPattern;
-VclBuilder::stringmap::iterator aFind = rMap.find(OString(pattern));
+OString sCustomProperty;
+VclBuilder::stringmap::iterator aFind =
rMap.find(OString(customproperty));
if (aFind != rMap.end())
{
-sPattern = aFind-second;
+sCustomProperty = aFind-second;
rMap.erase(aFind);
}
-return sPattern;
+return sCustomProperty;
}
bool extractResizable(VclBuilder::stringmap rMap)
@@ -688,7 +688,7 @@ Window *VclBuilder::makeObject(Window *pParent, const
OString name, const OStri
else if (name == GtkSpinButton)
{
extractSpinAdjustment(id, rMap);
-OString sPattern = extractPattern(rMap);
+OString sPattern = extractCustomProperty(rMap);
OString sUnit = sPattern;
for (sal_Int32 i = 0; i sPattern.getLength(); ++i)
@@ -755,7 +755,11 @@ Window *VclBuilder::makeObject(Window *pParent, const
OString name, const OStri
// everything over to SvTreeViewBox
//d) remove the users of makeSvTreeViewBox
extractModel(id, rMap);
-pWindow = new ListBox(pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK);
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK;
+OString sBorder = extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+nWinStyle |= WB_BORDER;
+pWindow = new ListBox(pParent, nWinStyle);
}
else if (name == GtkLabel)
pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
@@ -802,7 +806,10 @@ Window *VclBuilder::makeObject(Window *pParent, const
OString name, const OStri
else if (name == GtkNotebook)
pWindow = new TabControl(pParent, WB_STDTABCONTROL|WB_3DLOOK);
else if (name == GtkDrawingArea)
-pWindow = new Window(pParent);
+{
+OString sBorder = extractCustomProperty(rMap);
+pWindow = new Window(pParent, sBorder.isEmpty() ? 0 : WB_BORDER);
+}
else if (name == GtkTextView)
{
extractBuffer(id, rMap);
@@ -1013,7 +1020,7 @@ void VclBuilder::handleTabChild(Window *pParent,
xmlreader::XmlReader reader)
if (nDelim != -1)
{
OString sPattern = sID.copy(nDelim+1);
-aProperties[OString(pattern)] = sPattern;
+aProperties[OString(customproperty)] = sPattern;
sID = sID.copy(0, nDelim);
}
}
@@ -1340,7 +1347,7 @@ Window* VclBuilder::handleObject(Window *pParent,
xmlreader::XmlReader reader)
{
OString sClass;
OString sID;
-OString sPattern;
+OString sCustomProperty;
xmlreader::Span name;
int nsId;
@@ -1359,7 +1366,7 @@ Window* VclBuilder::handleObject(Window *pParent,
xmlreader::XmlReader reader)
sal_Int32 nDelim = sID.indexOf(':');
if (nDelim != -1)
{
-sPattern = sID.copy(nDelim+1);
+sCustomProperty = sID.copy(nDelim+1);
sID = sID.copy(0, nDelim);
}
}
@@ -1375,8 +1382,8 @@ Window* VclBuilder::handleObject(Window *pParent,
xmlreader::XmlReader reader)
stringmap aProperties, aPangoAttributes;
-if (!sPattern.isEmpty())
-aProperties[OString(pattern)] = sPattern;
+if (!sCustomProperty.isEmpty())
+aProperties[OString(customproperty)] = sCustomProperty;
Re: [PATCH] Comment translation german - english
Hello, Il 10/02/2013 01:27, Matthias Freund (via Code Review) ha scritto: Change-Id: If10593f81d4b2a00b8305e955ca7e6a15ed47aff --- M sw/source/ui/table/tablepg.hxx 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx @@ -110,8 +110,8 @@ SwTwips nMinWidth; sal_uInt16 nNoOfCols; sal_uInt16 nNoOfVisibleCols; -//Breite merken, wenn auf autom. Ausrichtung gestellt wird -sal_uInt16 aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields +//Remember the with, when switching to autoalign ^ --- this looks like a typo, should this be width? thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - embeddedobj/source
embeddedobj/source/msole/emboleobj.windows.component |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bf9157f9cc26446f0c25e85393fbe3a7603455d2 Author: Michael Stahl mst...@redhat.com Date: Fri Feb 8 19:29:07 2013 +0100 fdo#60234 fdo#60492: fix emboleobj library on WNT: Use prefix consistently in all component files for the library. (regression from 393588ce8e698203dd87a87eb506afb551457717) Change-Id: I58dce631f474e022be320c748f62238953a28e17 (cherry picked from commit 63ca871bf8f14e0450e5da0dbcfa3ee5d48f1604) Reviewed-on: https://gerrit.libreoffice.org/2055 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component index d70f7dc..ac823ee 100644 --- a/embeddedobj/source/msole/emboleobj.windows.component +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- -component loader=com.sun.star.loader.SharedLibrary +component loader=com.sun.star.loader.SharedLibrary prefix=emboleobj xmlns=http://openoffice.org/2010/uno-components; implementation name=com.sun.star.comp.embed.MSOLEObjectSystemCreator service name=com.sun.star.comp.embed.MSOLEObjectSystemCreator/ ___ 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/source
svtools/source/contnr/treelist.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4ded3c56534770e76108befec0d25c9db9e25f16 Author: Caolán McNamara caol...@redhat.com Date: Sun Feb 10 21:34:31 2013 + resorted SvTreeLists munged horribly e.g. tools-options-paths, click the sort icon, reclick it few times and the list doesn't reverse but instead shows the same two entries over and over again. Regression since fb01d8e132ab9097ed30b3bc4c7585622df591ad Change-Id: Ifc151ad72a27f1cdc3141e356ad6d100e6219cc2 (cherry picked from commit dde8e266084c89860a9a91f2a29ac31b730a9c4a) Reviewed-on: https://gerrit.libreoffice.org/2093 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index d0125f4..43968c5 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1583,6 +1583,7 @@ void SvTreeList::ResortChildren( SvTreeListEntry* pParent ) // Recursively sort child entries. ResortChildren(p); } +SetListPositions(pParent-maChildren); // correct list position in target list } void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig cui/UI_cui.mk helpcontent2 svtools/source sw/uiconfig
cui/UI_cui.mk |1
cui/source/inc/dbregister.hxx |4
cui/source/inc/helpid.hrc |4
cui/source/inc/optpath.hxx | 19 ---
cui/source/options/dbregister.cxx | 65 +--
cui/source/options/optHeaderTabListbox.cxx |5
cui/source/options/optHeaderTabListbox.hxx |6 -
cui/source/options/optpath.cxx | 150 -
cui/source/options/optpath.hrc | 33 -
cui/source/options/optpath.src | 66 ---
cui/uiconfig/ui/optpathspage.ui| 170 +
helpcontent2 |2
svtools/source/contnr/svimpbox.cxx |6 -
sw/uiconfig/swriter/ui/libpaths.ui | 90 ---
14 files changed, 293 insertions(+), 328 deletions(-)
New commits:
commit 705b60f94ea5721662811501594d13d1ad925eb3
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 8 16:48:34 2013 +
move paths option page .ui to cui and adapt code
Change-Id: I60063a0d101ef47271194e45ee59f9ff622a4f1c
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index db290b7..820dcf2 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/optadvancedpage \
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optfontspage \
+ cui/uiconfig/ui/optpathspage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 8621fe4..62e2b93 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -26,6 +26,7 @@
#include svl/poolitem.hxx
#include ControlFocusHelper.hxx
#include sfx2/basedlgs.hxx
+#include svx/simptabl.hxx
class SvTreeListEntry;
namespace svx
@@ -46,12 +47,11 @@ namespace svx
FixedLine aStdBox;
FixedText aTypeText;
FixedText aPathText;
-SvxControlFocusHelper aPathCtrl;
+SvxSimpleTableContainer aPathCtrl;
PushButton m_aNew;
PushButton m_aEdit;
PushButton m_aDelete;
-HeaderBar* pHeaderBar;
::svx::OptHeaderTabListBox* pPathBox;
SvTreeListEntry*m_pCurEntry;
sal_uLong m_nOldCount;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 43e79e1..e67692a 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -24,7 +24,6 @@
// Help-Ids --
#define HID_OPTIONS_SAVE CUI_HID_OPTIONS_SAVE
-#define HID_OPTIONS_PATH CUI_HID_OPTIONS_PATH
#define HID_OPTIONS_GENERAL CUI_HID_OPTIONS_GENERAL
#define HID_OPTIONS_LINGU CUI_HID_OPTIONS_LINGU
#define HID_OPTIONS_DICT_NEW CUI_HID_OPTIONS_DICT_NEW
@@ -41,7 +40,6 @@
#define HID_EDIT_MODULES CUI_HID_EDIT_MODULES
#define HID_LNGDLG_NUM_PREBREAK CUI_HID_LNGDLG_NUM_PREBREAK
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
-#define HID_OPTIONS_PATHS_SELECTFOLDER CUI_HID_OPTIONS_PATHS_SELECTFOLDER
#define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
#define HID_OPTIONS_JAVA_CLASSPATH CUI_HID_OPTIONS_JAVA_CLASSPATH
#define HID_SVXPAGE_JSEARCH_OPTIONS CUI_HID_SVXPAGE_JSEARCH_OPTIONS
@@ -60,11 +58,9 @@
#define HID_DBPATH_HEADERBAR CUI_HID_DBPATH_HEADERBAR
#define HID_OFAPAGE_SMARTTAG_OPTIONS CUI_HID_OFAPAGE_SMARTTAG_OPTIONS
#define HID_OFAPAGE_MSFLTR2_CLB CUI_HID_OFAPAGE_MSFLTR2_CLB
-#define HID_OPTPATH_CTL_PATH CUI_HID_OPTPATH_CTL_PATH
#define HID_OFADLG_TREELISTBOX CUI_HID_OFADLG_TREELISTBOX
#define HID_DLG_WEBCONNECTION_INFO CUI_HID_DLG_WEBCONNECTION_INFO
#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST
CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST
-#define HID_OPTPATH_HEADERBAR CUI_HID_OPTPATH_HEADERBAR
#define HID_WARN_NAME_DUPLICATE CUI_HID_WARN_NAME_DUPLICATE
#define HID_COLORPAGE_DOCCOLOR_LB CUI_HID_COLORPAGE_DOCCOLOR_LB
#define HID_COLORPAGE_DOCBOUNDARIES_LB CUI_HID_COLORPAGE_DOCBOUNDARIES_LB
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 4a25dfe..e6b8982 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -20,14 +20,9 @@
#define _SVX_OPTPATH_HXX
#include sfx2/tabdlg.hxx
+#include svx/simptabl.hxx
#include vcl/fixed.hxx
#include vcl/group.hxx
-
-#ifdef _SVX_OPTPATH_CXX
-#include svtools/headbar.hxx
-#else
-class HeaderBar;
-#endif
#include ControlFocusHelper.hxx
#include com/sun/star/ui/dialogs/XFolderPicker2.hpp
@@ -47,14 +42,10 @@ class SvxPathTabPage;
class SvxPathTabPage : public SfxTabPage
{
private:
-FixedLine aStdBox;
-FixedText aTypeText;
-FixedText aPathText;
-SvxControlFocusHelper aPathCtrl;
-PushButton aStandardBtn;
-
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/plugin.hxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 847749e975a7111ea306909a29fddb5df13e9a70 Author: Marc-André Laverdière marc-an...@atc.tcs.com Date: Fri Feb 8 09:54:16 2013 -0500 Fixed compilation error of Clang plugins on Ubuntu/Mint Change-Id: Ib08c5075034e0e16c5541f05425ef15d2cc3a6f6 Reviewed-on: https://gerrit.libreoffice.org/2045 Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx index 92ff6f3..d30c37a 100644 --- a/compilerplugins/clang/plugin.hxx +++ b/compilerplugins/clang/plugin.hxx @@ -15,6 +15,8 @@ #include clang/AST/ASTContext.h #include clang/AST/RecursiveASTVisitor.h +#include clang/Basic/FileManager.h +#include clang/Basic/SourceManager.h #if __clang_major__ 3 || __clang_major__ == 3 __clang_minor__ 2 #include clang/Rewrite/Rewriter.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source sw/source
sc/source/ui/drawfunc/fusel.cxx | 28 ++
sc/source/ui/drawfunc/futext.cxx | 41 ---
sd/source/ui/func/fusel.cxx |5 +---
sd/source/ui/func/futext.cxx | 22
sw/source/ui/docvw/edtwin.cxx|8 +++
5 files changed, 77 insertions(+), 27 deletions(-)
New commits:
commit e80a8b6f14fac6bb6cc7ea55b118f95472d5b654
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Feb 9 14:31:21 2013 +0100
fdo#55430 switches off text mode when clicking an other object.
This patch complements 85ea03ae536831649b104694d08dced4d4c8663f (and
6fbba11da54b52554941f00b07e42cc5d7a1643c, which didn't work correctly
before)
This also fixes issues when clicking on another object to stop text editing.
Switches off text mode, and instantaneously selects the other object.
(Rotation doesn't belong into the ./sd/ text routine AT ALL, which also
caused bug 37482,
which is resolved differently from now on)
(Creating text fields doesn't belong into the ./sc/ shape text routine
either, and if this executed, it causes funny glitches)
Known issues: text mode stays on when you use drag'n drop (the one WITH
waiting, to move to other applications etc).
Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/1344
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 4968f15..a3568b0 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -53,6 +53,8 @@
// Maximal erlaubte Mausbewegung um noch DragDrop zu starten
//! fusel,fuconstr,futext - zusammenfassen!
#define SC_MAXDRAGMOVE 3
+// Min necessary mouse motion for normal dragging
+#define SC_MINDRAGMOVE 2
// ---
@@ -381,11 +383,14 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent
rMEvt)
sal_Bool bReturn = FuDraw::MouseButtonUp(rMEvt);
sal_Bool bOle = pViewShell-GetViewFrame()-GetFrame().IsInPlace();
+SdrObject* pObj = NULL;
+SdrPageView* pPV = NULL;
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
}
+sal_uInt16 nDrgLog = sal_uInt16 (
pWindow-PixelToLogic(Size(SC_MINDRAGMOVE,0)).Width() );
Point aPnt( pWindow-PixelToLogic( rMEvt.GetPosPixel() ) );
bool bCopy = false;
@@ -416,7 +421,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent rMEvt)
for ( sal_uLong i = 0; i nMarkCount; ++i )
{
SdrMark* pMark = rSdrMarkList.GetMark( i );
-SdrObject* pObj = ( pMark ? pMark-GetMarkedSdrObj() :
NULL );
+pObj = ( pMark ? pMark-GetMarkedSdrObj() : NULL );
if ( pObj )
{
ScChartHelper::AddRangesIfProtectedChart(
aProtectedChartRangesVector, pDocument, pObj );
@@ -426,6 +431,21 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent
rMEvt)
bCopy = true;
}
+if (!rMEvt.IsShift() !rMEvt.IsMod1() !rMEvt.IsMod2()
+Abs(aPnt.X() - aMDPos.X()) nDrgLog
+Abs(aPnt.Y() - aMDPos.Y()) nDrgLog)
+{
+/*
+* If a user wants to click on an object in front of a marked
+* one, he releases the mouse button immediately
+**/
+if (pView-PickObj(aMDPos, pView-getHitTolLog(), pObj, pPV,
SDRSEARCH_ALSOONMASTER | SDRSEARCH_BEFOREMARK))
+{
+pView-UnmarkAllObj();
+pView-MarkObj(pObj,pPV,false,false);
+return (sal_True);
+}
+}
pView-EndDragObj( rMEvt.IsMod1() );
pView-ForceMarkedToAnotherPage();
@@ -433,7 +453,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent rMEvt)
if (rMarkList.GetMarkCount() == 1)
{
SdrMark* pMark = rMarkList.GetMark(0);
- SdrObject* pObj = pMark-GetMarkedSdrObj();
+ pObj = pMark-GetMarkedSdrObj();
FuPoor* pPoor =
pViewShell-GetViewData()-GetView()-GetDrawFuncPtr();
FuText* pText = static_castFuText*(pPoor);
pText-StopDragMode(pObj );
@@ -458,7 +478,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent rMEvt)
bool bFound = false;
for( sal_uLong nIdx = 0; !bFound (nIdx nCount);
++nIdx )
{
-SdrObject* pObj =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - python3/UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0977ba31ee91f2ccaef87883407a3d3700e7551a Author: Miklos Vajna vmik...@suse.cz Date: Sun Feb 10 21:41:54 2013 +0100 python3: 15833.patch makes sense with ro /usr on Linux as well Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad (cherry picked from commit 2b5dd63565509c2e02c193522a85d3dc6b60361d) Reviewed-on: https://gerrit.libreoffice.org/2090 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index eb07def..d8c0862 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -32,7 +32,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-ffi-clang.patch.1 \ )) -ifeq ($(OS),MACOSX) +ifneq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-15833.patch.1 \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] resolve fdo#60450 - Printer list is missing its border in Pr...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2052 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2052 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#60234 fdo#60492: fix emboleobj library on WNT:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2055 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2055 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58dce631f474e022be320c748f62238953a28e17 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] resorted SvTreeLists munged horribly
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2093 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2093 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc151ad72a27f1cdc3141e356ad6d100e6219cc2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fixed compilation error of Clang plugins on Ubuntu/Mint
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2045 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2045 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib08c5075034e0e16c5541f05425ef15d2cc3a6f6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marc-André Laverdière marc-an...@atc.tcs.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#55430 switches off text mode when clicking an other obje...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1344 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1344 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495 Gerrit-PatchSet: 11 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: Radek Doulík r...@novell.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] python3: 15833.patch makes sense with ro /usr on Linux as we...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2090 Approvals: Caolán McNamara: Verified; Looks good to me, approved Norbert Thiebaud: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/2090 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8sty.cxx | 33 +
sw/source/filter/ww8/ww8atr.cxx |2 +-
2 files changed, 18 insertions(+), 17 deletions(-)
New commits:
commit 532e25f8b0ef1daeca1f9f84c7084812b72841d5
Author: Luke Deller l...@deller.id.au
Date: Sun Feb 10 02:19:46 2013 +1100
export different first page header/footer to doc/docx
Change-Id: Iba39bf12c2419bb480e91ccb45851ec869c40e01
Reviewed-on: https://gerrit.libreoffice.org/2062
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index f002c1f..b0e4e92 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1525,7 +1525,6 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
sal_uInt8 nBreakCode = 2;// default neue Seite beginnen
bool bOutPgDscSet = true, bLeftRightPgChain = false;
const SwFrmFmt* pPdFmt = pPd-GetMaster();
-const SwFrmFmt* pPdFirstPgFmt = pPdFmt;
if ( rSepInfo.pSectionFmt )
{
// ist pSectionFmt gesetzt, dann gab es einen SectionNode
@@ -1584,7 +1583,15 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
}
}
-bool titlePage = false;
+// Libreoffice 4.0 introduces support for page styles (SwPageDesc) with
+// a different header/footer for the first page. The same effect can be
+// achieved by chaining two page styles together (SwPageDesc::GetFollow)
+// which are identical except for header/footer.
+// The latter method is still used by the doc/docx import filter.
+// In both of these cases, we emit a single Word section with different
+// first page header/footer.
+const SwFrmFmt* pPdFirstPgFmt = pPd-GetFirst();
+bool titlePage = !pPd-IsFirstShared();
if ( bOutPgDscSet )
{
// es ist ein Follow gesetzt und dieser zeigt nicht auf sich
@@ -1600,7 +1607,7 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
{
const SwPageDesc *pFollow = pPd-GetFollow();
const SwFrmFmt rFollowFmt = pFollow-GetMaster();
-if ( sw::util::IsPlausableSingleWordSection( *pPdFmt, rFollowFmt )
)
+if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt,
rFollowFmt ) )
{
if (rSepInfo.pPDNd)
pPdFirstPgFmt = pPd-GetPageFmtOfNode( *rSepInfo.pPDNd );
@@ -1629,7 +1636,7 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
AttrOutput().SectionPageBorders( pPdFmt, pPdFirstPgFmt );
const SfxPoolItem* pItem;
-if ( pPdFmt != pPdFirstPgFmt SFX_ITEM_SET ==
+if ( titlePage SFX_ITEM_SET ==
pPdFirstPgFmt-GetItemState( RES_PAPER_BIN, true, pItem ) )
{
pISet = pPdFirstPgFmt-GetAttrSet();
@@ -1703,20 +1710,14 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt,
WW8_HEADER_FIRST );
MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt,
WW8_FOOTER_FIRST );
}
-// write other headers/footers only if it's not on the first page -
I'm not quite sure
-// this is technically correct, but it avoids first-page
headers/footers
-// extending to all pages (bnc#654230)
-if( !titlePage || pPdFmt != pPdFirstPgFmt )
-{
-MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFmt,
WW8_HEADER_ODD );
-MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFmt,
WW8_FOOTER_ODD );
+MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD
);
+MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD
);
-if ( !pPd-IsHeaderShared() || bLeftRightPgChain )
-MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt,
WW8_HEADER_EVEN );
+if ( !pPd-IsHeaderShared() || bLeftRightPgChain )
+MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt,
WW8_HEADER_EVEN );
-if ( !pPd-IsFooterShared() || bLeftRightPgChain )
-MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdLeftFmt,
WW8_FOOTER_EVEN );
-}
+if ( !pPd-IsFooterShared() || bLeftRightPgChain )
+MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdLeftFmt,
WW8_FOOTER_EVEN );
AttrOutput().SectionWW6HeaderFooterFlags( nHeadFootFlags );
}
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 003bde1..096f012 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -364,7 +364,7 @@ bool MSWordExportBase::SetAktPageDescFromNode(const SwNode
rNd)
bNewPageDesc = true;
else
{
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8sty.cxx |8 --
sw/source/filter/ww8/ww8par.cxx | 113 --
sw/source/filter/ww8/ww8par.hxx |8 +-
sw/source/filter/ww8/ww8par6.cxx | 98 +++-
4 files changed, 76 insertions(+), 151 deletions(-)
New commits:
commit 1e113cb7604e1509e7d598a9be329f1f7b6e9322
Author: Luke Deller l...@deller.id.au
Date: Sun Feb 10 02:31:47 2013 +1100
import different first page header/footer from doc
When a Word section has a different first page header/footer,
this used to be imported into LO as a chain of two page styles.
Now that LO supports a single page style with different first page
header/footer we can import to that.
This change also incidentally fixes fdo#57908.
bnc#654230 had the same underlying problem, so the workaround committed
for that (which includes comments expressing lack of understanding)
has been removed.
Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605
Reviewed-on: https://gerrit.libreoffice.org/2065
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index b0e4e92..3d40f4e 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1587,7 +1587,7 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
// a different header/footer for the first page. The same effect can be
// achieved by chaining two page styles together (SwPageDesc::GetFollow)
// which are identical except for header/footer.
-// The latter method is still used by the doc/docx import filter.
+// The latter method was previously used by the doc/docx import filter.
// In both of these cases, we emit a single Word section with different
// first page header/footer.
const SwFrmFmt* pPdFirstPgFmt = pPd-GetFirst();
@@ -1622,12 +1622,6 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
}
}
-// The code above tries to detect if this is first page
headers/footers,
-// but it doesn't work even for quite trivial testcases. As I don't
actually
-// understand that code, I'll keep it. The simple and (at least for
me) reliable way
-// to detect for first page seems to be just RES_POOLPAGE_FIRST.
-if( pPd-GetPoolFmtId() == RES_POOLPAGE_FIRST )
-titlePage = true;
if( titlePage )
AttrOutput().SectionTitlePage();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index fdef14c..2659624 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1932,27 +1932,11 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8
nWhichItems, sal_uInt8 grpfIh
return false;
}
-void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
-const SwPageDesc *pPrev, const wwSection rSection)
+void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
+const wwSection rSection)
{
-sal_uInt8 nWhichItems = 0;
-SwPageDesc *pPD = 0;
-if (!bIsTitle)
-{
-nWhichItems =
-rSection.maSep.grpfIhdt ~(WW8_HEADER_FIRST | WW8_FOOTER_FIRST);
-pPD = rSection.mpPage;
-}
-else
-{
-// Always read title page header/footer data - it could be used by
following sections
-nWhichItems = ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST );
-
-pPD = rSection.mpTitlePage;
-}
-
sal_uInt8 grpfIhdt = rSection.maSep.grpfIhdt;
-
+SwPageDesc *pPD = rSection.mpPage;
if( pHdFt )
{
@@ -1962,7 +1946,7 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
{
-if (nI nWhichItems)
+if (nI grpfIhdt)
{
bool bOk = true;
if( bVer67 )
@@ -1975,10 +1959,14 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int
nSect,
bool bUseLeft
= (nI ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true:
false;
+bool bUseFirst
+= (nI ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true:
false;
bool bFooter
= (nI ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD |
WW8_FOOTER_FIRST )) ? true: false;
-SwFrmFmt rFmt = bUseLeft ? pPD-GetLeft() : pPD-GetMaster();
+SwFrmFmt rFmt = bUseLeft ? pPD-GetLeft()
+: bUseFirst ? pPD-GetFirst()
+: pPD-GetMaster();
SwFrmFmt* pHdFtFmt;
if (bFooter)
@@ -1989,6 +1977,8 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
pPD-GetMaster().SetFmtAttr(SwFmtFooter(true));
if (bUseLeft)
[Libreoffice-commits] core.git: cppuhelper/source registry/tools
cppuhelper/source/typedescriptionprovider.cxx | 149 --
registry/tools/reg2bin.cxx| 46 ++--
2 files changed, 159 insertions(+), 36 deletions(-)
New commits:
commit a6b1ed45fb5cf4ef192f0bb32adb8da963a51283
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 11 11:45:10 2013 +0100
Fix floating point handling
Change-Id: Ib29dfc71f8c2d0797ead2c32f77bedf7156a3393
diff --git a/cppuhelper/source/typedescriptionprovider.cxx
b/cppuhelper/source/typedescriptionprovider.cxx
index 2d19518..7e12c29 100644
--- a/cppuhelper/source/typedescriptionprovider.cxx
+++ b/cppuhelper/source/typedescriptionprovider.cxx
@@ -49,6 +49,7 @@
#include com/sun/star/uno/XInterface.hpp
#include cppuhelper/compbase2.hxx
#include cppuhelper/implbase1.hxx
+#include osl/endian.h
#include osl/file.h
#include osl/file.hxx
#include osl/mutex.hxx
@@ -221,11 +222,11 @@
// *** 7: UNSIGNED HYPER
// followed by UInt64 value
// *** 8: FLOAT
-// followed by UInt32 value, representing values in IEEE-754 single
-// precision format
+// followed by 4-byte value, representing values in ISO 60599 binary32
+// format, LSB first
// *** 9: DOUBLE
-// followed by UInt64 value, representing values in IEEE-754 double
-// precision format
+// followed by 8-byte value, representing values in ISO 60599 binary64
+// format, LSB first
//
// Memory layout:
//
@@ -236,33 +237,51 @@
namespace {
-// sizeof (UInt16) == 2
-struct UInt16 {
+// sizeof (Memory16) == 2
+struct Memory16 {
unsigned char byte[2];
-sal_uInt16 get() const {
+sal_uInt16 getUnsigned16() const {
return static_cast sal_uInt16 (byte[0])
| (static_cast sal_uInt16 (byte[1]) 8);
}
};
-// sizeof (UInt32) == 4
-struct UInt32 {
+// sizeof (Memory32) == 4
+struct Memory32 {
unsigned char byte[4];
-sal_uInt32 get() const {
+sal_uInt32 getUnsigned32() const {
return static_cast sal_uInt32 (byte[0])
| (static_cast sal_uInt32 (byte[1]) 8)
| (static_cast sal_uInt32 (byte[2]) 16)
| (static_cast sal_uInt32 (byte[3]) 24);
}
+
+float getIso60599Binary32() const {
+// Create a copy in either case, for alingment:
+unsigned char buf[4];
+#if defined OSL_LITENDIAN
+buf[0] = byte[0];
+buf[1] = byte[1];
+buf[2] = byte[2];
+buf[3] = byte[3];
+#else
+buf[0] = byte[3];
+buf[1] = byte[2];
+buf[2] = byte[1];
+buf[3] = byte[0];
+#endif
+return *reinterpret_cast float * (buf);
+// assuming float is ISO 60599 binary32
+}
};
-// sizeof (UInt64) == 8
-struct UInt64 {
+// sizeof (Memory64) == 8
+struct Memory64 {
unsigned char byte[8];
-sal_uInt64 get() const {
+sal_uInt64 getUnsigned64() const {
return static_cast sal_uInt64 (byte[0])
| (static_cast sal_uInt64 (byte[1]) 8)
| (static_cast sal_uInt64 (byte[2]) 16)
@@ -272,6 +291,32 @@ struct UInt64 {
| (static_cast sal_uInt64 (byte[6]) 48)
| (static_cast sal_uInt64 (byte[7]) 56);
}
+
+double getIso60599Binary64() const {
+// Create a copy in either case, for alingment:
+unsigned char buf[8];
+#if defined OSL_LITENDIAN
+buf[0] = byte[0];
+buf[1] = byte[1];
+buf[2] = byte[2];
+buf[3] = byte[3];
+buf[4] = byte[4];
+buf[5] = byte[5];
+buf[6] = byte[6];
+buf[7] = byte[7];
+#else
+buf[0] = byte[7];
+buf[1] = byte[6];
+buf[2] = byte[5];
+buf[3] = byte[4];
+buf[4] = byte[3];
+buf[5] = byte[2];
+buf[6] = byte[1];
+buf[7] = byte[0];
+#endif
+return *reinterpret_cast double * (buf);
+// assuming double is ISO 60599 binary64
+}
};
struct MappedFile:
@@ -287,6 +332,10 @@ struct MappedFile:
sal_uInt64 read64(sal_uInt32 offset) const;
+float readIso60599Binary32(sal_uInt32 offset) const;
+
+double readIso60599Binary64(sal_uInt32 offset) const;
+
rtl::OUString readNameNul(sal_uInt32 offset) const;
rtl::OUString readNameLen(sal_uInt32 offset, sal_uInt32 * newOffset = 0)
@@ -306,6 +355,10 @@ private:
sal_uInt32 get32(sal_uInt32 offset) const;
sal_uInt64 get64(sal_uInt32 offset) const;
+
+float getIso60599Binary32(sal_uInt32 offset) const;
+
+double getIso60599Binary64(sal_uInt32 offset) const;
};
MappedFile::MappedFile(rtl::OUString const fileUrl) {
@@ -378,6 +431,26 @@ sal_uInt64 MappedFile::read64(sal_uInt32 offset) const {
return get64(offset);
}
+float MappedFile::readIso60599Binary32(sal_uInt32 offset) const {
+assert(size = 8);
+if (offset size - 4) {
+throw css::uno::DeploymentException(
+broken UNOIDL file: offset for 32-bit value too large,
+css::uno::Reference
Cppcheck: bEmbed always false - block never called in fillinfo.cxx (sc module)
Hello,
Cppcheck reported this:
sc/source/core/data/fillinfo.cxx
507 variableScope style The scope of the variable 'bEmbed' can be
reduced.
Here are the lines:
507 bool bEmbed = false;
508
509 if (bScenario)
510 {
511 pInfo-pBackground =
ScGlobal::GetButtonBrushItem();
512 pThisRowInfo-bEmptyBack =
false;
513 }
514 else if (bEmbed)
515 {
516 pInfo-pBackground =
ScGlobal::GetEmbeddedBrushItem();
517 pThisRowInfo-bEmptyBack =
false;
518 }
and bEmbed is nowhere else in this function
See
http://opengrok.libreoffice.org/xref/core/sc/source/core/data/fillinfo.cxx#507
So should we remove bEmbed and the else if block or is something really
lacking?
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Cppcheck-bEmbed-always-false-block-never-called-in-fillinfo-cxx-sc-module-tp4036346.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source officecfg/registry
editeng/source/misc/swafopt.cxx|6 +++--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 992f3ce06773cd05dbb66162f51408338d3db801 Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Thu Jan 31 11:37:59 2013 +0100 Better default values for Word completion feature http://nabble.documentfoundation.org/Libreoffice-ux-advise-Word-completion-default-value-td4031168.html Change-Id: Ifef07653c2155b3c26d65d41cae1164b44fbd04f Reviewed-on: https://gerrit.libreoffice.org/1937 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index a416507..a3cba1b 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -49,7 +49,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bWithRedlining = bAutoCmpltEndless = bAutoCmpltAppendBlanc = -bAutoCmpltShowAsTip = sal_False; +bAutoCmpltShowAsTip = sal_True; bSetBorder = bCreateTable = @@ -76,8 +76,8 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() cByInputBullet = cBullet; aByInputBulletFont = aBulletFont; -nAutoCmpltWordLen = 10; -nAutoCmpltListLen = 500; +nAutoCmpltWordLen = 8; +nAutoCmpltListLen = 1000; m_pAutoCompleteList = 0; pSmartTagMgr = 0; } diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 6fec206..8f987e0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -4782,7 +4782,7 @@ descSets the value for the minimum word length./desc labelMin. word length/label /info -value10/value +value8/value /prop prop oor:name=MaxListLen oor:type=xs:int oor:nillable=false !-- OldPath: Writer/AutoComplete/Words -- @@ -4793,7 +4793,7 @@ descSets the maximum number of words to be recalled./desc labelMax. entries/label /info - value500/value + value1000/value /prop prop oor:name=CollectWords oor:type=xs:boolean oor:nillable=false !-- OldPath: Writer/AutoComplete/Words -- @@ -4837,7 +4837,7 @@ descSpecifies if the suggestions for the automatic word completion function should be displayed as Tip helps./desc labelShow as tip/label /info - valuefalse/value + valuetrue/value /prop prop oor:name=AcceptKey oor:type=xs:int oor:nillable=false !-- OldPath: Writer/AutoComplete/Words -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source svx/source
cui/source/dialogs/multipat.cxx |2 +-
cui/source/inc/radiobtnbox.hxx |2 +-
cui/source/options/certpath.cxx |2 +-
cui/source/options/fontsubs.cxx |2 +-
cui/source/options/fontsubs.hxx |2 +-
cui/source/options/optjava.cxx |2 +-
svx/source/dialog/simptabl.cxx |1 -
7 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 4895dd454ccf3d403b2ed7aa4b19f726c28e6032
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 11 11:10:25 2013 +
add borders to simpletablecontainer
Change-Id: I9215516c21ce1330cf1fef07cbd647a1c318e241
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index c45337e..1b2f139 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -183,7 +183,7 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent,
sal_Bool bEmptyAllowed
aPathFL ( this, CUI_RES( FL_MULTIPATH) ),
aPathLB ( this, CUI_RES( LB_MULTIPATH ) ),
m_aRadioLBContainer(this, CUI_RES(LB_RADIOBUTTON)),
-aRadioLB(m_aRadioLBContainer),
+aRadioLB(m_aRadioLBContainer, WB_BORDER),
aRadioFT( this, CUI_RES( FT_RADIOBUTTON ) ),
aAddBtn ( this, CUI_RES( BTN_ADD_MULTIPATH ) ),
aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index c6c3b43..efa1579 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -38,7 +38,7 @@ protected:
virtual voidKeyInput( const KeyEvent rKEvt );
public:
-SvxRadioButtonListBox(SvxSimpleTableContainer rParent, WinBits nBits =
WB_BORDER);
+SvxRadioButtonListBox(SvxSimpleTableContainer rParent, WinBits nBits);
~SvxRadioButtonListBox();
voidHandleEntryChecked( SvTreeListEntry* _pEntry );
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index e567260..37719bc 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -50,7 +50,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
, m_aCertPathFL ( this, CUI_RES( FL_CERTPATH ) )
, m_aCertPathFT ( this, CUI_RES( FT_CERTPATH ) )
, m_aCertPathListContainer( this, CUI_RES( LB_CERTPATH ) )
-, m_aCertPathList( m_aCertPathListContainer )
+, m_aCertPathList( m_aCertPathListContainer, WB_BORDER )
, m_aAddBtn ( this, CUI_RES( PB_ADD ) )
, m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
, m_aOKBtn ( this, CUI_RES( PB_OK ) )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 87afaf9..2f94e8b 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -63,7 +63,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
pCheckLBContainer-set_width_request(aControlSize.Width());
pCheckLBContainer-set_height_request(aControlSize.Height());
-m_pCheckLB = new SvxFontSubstCheckListBox(*pCheckLBContainer);
+m_pCheckLB = new SvxFontSubstCheckListBox(*pCheckLBContainer, 0);
m_pCheckLB-SetHelpId(HID_OFA_FONT_SUBST_CLB);
m_pCheckLB-SetStyle(m_pCheckLB-GetStyle()|WB_HSCROLL|WB_VSCROLL);
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 775960a..fbc29de 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -41,7 +41,7 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
virtual voidResize();
public:
-SvxFontSubstCheckListBox(SvxSimpleTableContainer rParent, WinBits
nBits = WB_BORDER)
+SvxFontSubstCheckListBox(SvxSimpleTableContainer rParent, WinBits
nBits)
: SvxSimpleTable(rParent, nBits)
{
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index a5389ca..47f1f9b 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -89,7 +89,7 @@ private:
const OUString m_sAccessibilityText;
public:
SvxJavaListBox(SvxSimpleTableContainer rParent, const OUString
rAccessibilityText)
-: SvxRadioButtonListBox(rParent)
+: SvxRadioButtonListBox(rParent, 0)
, m_sAccessibilityText(rAccessibilityText)
{
}
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index abed194..5fa4077 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -39,7 +39,6 @@ SvxSimpleTableContainer::SvxSimpleTableContainer(Window*
pParent, WinBits nBits)
: Control(pParent, nBits)
, m_pTable(NULL)
{
-SetBorderStyle(WINDOW_BORDER_NOBORDER);
}
extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
makeSvxSimpleTableContainer(Window *pParent,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] export different first page header/footer to doc/docx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2062 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2062 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba39bf12c2419bb480e91ccb45851ec869c40e01 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] import different first page header/footer from doc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2065 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2065 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Better default values for Word completion feature
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1937 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifef07653c2155b3c26d65d41cae1164b44fbd04f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#60491: scp2: always package emboleobj library on non-WNT...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2095 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/2095/1 fdo#60491: scp2: always package emboleobj library on non-WNT platforms (regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined DISABLE_ATL on all platforms in configure) (cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40) Conflicts: postprocess/Rdb_services.mk Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda --- M postprocess/packcomponents/makefile.mk M scp2/source/ooo/file_library_ooo.scp 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index fa3231c..a37ba73 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -224,12 +224,12 @@ .ENDIF -.IF $(DISABLE_ATL) == .IF $(OS) == WNT +.IF $(DISABLE_ATL) == my_components += component/embeddedobj/source/msole/emboleobj.windows +.ENDIF .ELSE my_components += component/embeddedobj/source/msole/emboleobj -.ENDIF .END .IF $(DISABLE_NEON) != TRUE diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 642cd81..6dd5e29 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -394,7 +394,8 @@ SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) -#ifndef DISABLE_ATL +/* fdo#60491 always need emboleobj library on non-WNT platforms */ +#if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif -- To view, visit https://gerrit.libreoffice.org/2095 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda 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#60491: embeddedobj: catch exception in fallback path
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2096
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/2096/1
fdo#60491: embeddedobj: catch exception in fallback path
This allows the OLE object to at least be passed to the OS for
opening...
(cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87)
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
---
M embeddedobj/source/msole/oleembed.cxx
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index ccf8161..2cd399b 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -709,7 +709,14 @@
aArgs ), uno::UNO_QUERY_THROW );
uno::Reference io::XStream xCONTENTS;
-
xNameContainer-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CONTENTS)))
= xCONTENTS;
+try
+{
+xNameContainer-getByName(CONTENTS) = xCONTENTS;
+}
+catch (container::NoSuchElementException const)
+{
+// ignore
+}
sal_Bool bCopied = xCONTENTS.is()
lcl_CopyStream(xCONTENTS-getInputStream(), xStream-getOutputStream());
--
To view, visit https://gerrit.libreoffice.org/2096
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo59953.rtf | 16 +++
sw/qa/extras/rtfimport/rtfimport.cxx | 12 +++
writerfilter/source/dmapper/DomainMapperTableManager.cxx |5 +++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 +--
4 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 7d4e28739681ca947112332016f9e904d4e587c9
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Feb 8 12:34:55 2013 +0100
fdo#59953 RTF import: fix unreadable graphic and nested cell contents
There were two issues here:
1) c3b0f13546b30e5db3aecd311c7178e4e0933208 added a mechanism to work
around broken documents, but that didn't deal with nested tables.
Additionally, the check compared the max row width with the width of the
last cell, not the last row.
2) d276d3f3ae112a11c8cb5768650d147cbb94275e cleaned up implicit
horizontal merge detection, but didn't deal with valid documents, where
each row definition is available twice.
(cherry picked from commit e15f9ceafdf6e8b21cd315936ab44edfa91dd8b2)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I1a32ec2fcb0d1a8fca7a7bd26501d3daf17880c9
Reviewed-on: https://gerrit.libreoffice.org/2044
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo59953.rtf
b/sw/qa/extras/rtfimport/data/fdo59953.rtf
new file mode 100644
index 000..66432e3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo59953.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\deff0
+\trowd\cellx7384\cellx9652
+\pard\intbl\sl0
+A1
+\cell
+\pard\intbl\sl0\lin10
+B1
+\cell
+\trowd\cellx7384\cellx9652\row
+\trowd\cellx7384\cellx9652
+\pard\intbl A2\cell
+\pard\intbl B2\cell
+\trowd\cellx7384\cellx9652
+\row
+\pard\itap0\sl0\lin14\rin8 \par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3e15f55..18ae927 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -138,6 +138,7 @@ public:
void testFdo58933();
void testFdo44053();
void testFdo58646line();
+void testFdo59953();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -226,6 +227,7 @@ void Test::run()
{fdo58933.rtf, Test::testFdo58933},
{fdo44053.rtf, Test::testFdo44053},
{fdo58646line.rtf, Test::testFdo58646line},
+{fdo59953.rtf, Test::testFdo59953},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1073,6 +1075,16 @@ void Test::testFdo58646line()
getParagraph(1, foo\nbar);
}
+void Test::testFdo59953()
+{
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+// Cell width of A1 was 4998 (e.g. not set / not wide enough, ~50% of
total width)
+uno::Referencetable::XTableRows xTableRows(xTable-getRows(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(7650), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators)[0].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 448d6e1..52fbd0c 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -222,7 +222,10 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
break;
case NS_ooxml::LN_CT_TblGridBase_gridCol:
{
-getCurrentGrid()-push_back(
ConversionHelper::convertTwipToMM100( nIntValue ) );
+if (nIntValue == -1)
+getCurrentGrid()-clear();
+else
+getCurrentGrid()-push_back(
ConversionHelper::convertTwipToMM100( nIntValue ) );
}
break;
case NS_ooxml::LN_CT_TcPrBase_vMerge : //vertical merge
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a58e139..366959e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1718,8 +1718,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
case RTF_NESTROW:
{
// If the right edge of the last cell (row width) is smaller
than the width of some other row, mimic the WW8 import: add a fake cell.
-RTFValue::Pointer_t pLastCellx =
m_aStates.top().aTableRowSprms.find(NS_ooxml::LN_CT_TblGridBase_gridCol, false);
-if (pLastCellx.get()
[Libreoffice-commits] core.git: framework/source
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 2fd93f19cf6c1ce808214c659f5a4c4b10c0c441
Author: Issa Alkurtass ialkurt...@kacst.edu.sa
Date: Sun Feb 10 09:32:39 2013 +0300
fdo#39370 - Fixed RTL/LTR and alignment buttons location on RTL interface
Reversed the location of the RTL and LTR buttons as well as the align right
and align left buttons on the RTL interface. It now matches the LTR
interface.
Done from toolboxdocumenthandler instead of modifying 20+ xml files.
Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af
Reviewed-on: https://gerrit.libreoffice.org/2077
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index b57d158..7826ac2 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -423,6 +423,23 @@ throw( SAXException, RuntimeException )
aToolbarItemProp[5].Name = m_aIsVisible;
aToolbarItemProp[6].Name = m_aTooltip;
+//fix for fdo#39370
+/// check whether RTL interface or not
+if(Application::GetSettings().GetLayoutRTL()){
+if (aCommandURL.compareTo(.uno:ParaLeftToRight) == 0)
+aCommandURL = .uno:ParaRightToLeft;
+else if (aCommandURL.compareTo(.uno:ParaRightToLeft)
== 0)
+aCommandURL = .uno:ParaLeftToRight;
+else if (aCommandURL.compareTo(.uno:LeftPara) == 0)
+aCommandURL = .uno:RightPara;
+else if (aCommandURL.compareTo(.uno:RightPara) == 0)
+aCommandURL = .uno:LeftPara;
+else if (aCommandURL.compareTo(.uno:AlignLeft) == 0)
+aCommandURL = .uno:AlignRight;
+else if (aCommandURL.compareTo(.uno:AlignRight) == 0)
+aCommandURL = .uno:AlignLeft;
+}
+
aToolbarItemProp[0].Value = aCommandURL;
aToolbarItemProp[1].Value = aHelpURL;
aToolbarItemProp[2].Value = aLabel;
___
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 |2 -- 1 file changed, 2 deletions(-) New commits: commit 17e9daa328c12b68bdd16502ea46c4ed1870dd0b Author: Thorsten Behrens tbehr...@suse.com Date: Mon Feb 11 12:40:13 2013 +0100 Remove limitation for codesigning to SDK =10.7 Change-Id: Iae2fbdc3ead54869d94d1e01c24a3384adb2a2b7 diff --git a/configure.ac b/configure.ac index 723998f..1d91c29 100644 --- a/configure.ac +++ b/configure.ac @@ -2749,8 +2749,6 @@ if test $_os = Darwin; then pretty_name=`security find-identity -p codesigning -v | grep $MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'` AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name]) fi -elif test -n $enable_macosx_code_signing -a $MACOSX_SDK_VERSION -lt 1070; then -AC_MSG_ERROR([Don't bother trying to use code signing with a SDK older than 10.7]) elif test -n $enable_macosx_code_signing; then MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing pretty_name=`security find-identity -p codesigning -v | grep $MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'` ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv |1 +
sc/qa/unit/data/ods/bug-fixes.ods|binary
sc/qa/unit/subsequent_filters-test.cxx |7 +++
3 files changed, 8 insertions(+)
New commits:
commit 97642ab568861444b95bddac63d4a41729934efc
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Feb 10 14:45:15 2013 +0700
add unittest for fdo#59240
Change-Id: Ic287228f578c9ecb0f69a47380c890e337203b31
Reviewed-on: https://gerrit.libreoffice.org/2078
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
b/sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
new file mode 100644
index 000..ffd5da6
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/bugFix_Sheet4.csv
@@ -0,0 +1 @@
+à¹.à¹à¹
diff --git a/sc/qa/unit/data/ods/bug-fixes.ods
b/sc/qa/unit/data/ods/bug-fixes.ods
index b7c0539..f40141b 100644
Binary files a/sc/qa/unit/data/ods/bug-fixes.ods and
b/sc/qa/unit/data/ods/bug-fixes.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 63261f9..16db954 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -903,6 +903,13 @@ void ScFiltersTest::testBugFixesODS()
CPPUNIT_ASSERT(!pDBData-HasHeader());
}
+{
+// fdo#59240
+OUString aCSVFileName;
+createCSVPath(bugFix_Sheet4., aCSVFileName);
+testFile(aCSVFileName, pDoc, 3);
+}
+
xDocSh-DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/swafopt.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 324709b6e3f6529924043b0cb2aa995478372ec3 Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 11 12:21:15 2013 + only wanted completion as tip by default Change-Id: I5885f277051c2b8780e4813ce4713b0c9e8bd8ea diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index a3cba1b..d532f57 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -48,9 +48,9 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bDelEmptyNode = bWithRedlining = bAutoCmpltEndless = -bAutoCmpltAppendBlanc = -bAutoCmpltShowAsTip = sal_True; +bAutoCmpltAppendBlanc = sal_False; +bAutoCmpltShowAsTip = bSetBorder = bCreateTable = bSetNumRule = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/cppunit/test_nested_struct.cxx | 215
basic/source/classes/sbunoobj.cxx | 40 -
2 files changed, 247 insertions(+), 8 deletions(-)
New commits:
commit 6865445a5ec90b49c5fde58531def4b9a64f26e8
Author: Noel Power noel.po...@suse.com
Date: Fri Feb 8 11:09:44 2013 +
fix basic access to nested uno structures fdo#60117
Although basic might appear to correctly change nested struct elements
fdo#60117 shows that basic can be fooled ( and even the watch(ed) variable
in the debugger shows the expected values ). The problem stems from the
fact that the uno object held by basic isn't infact modified when changed
via the introspection uno service.
Additionally pimp the existing tests to check the actual uno struct to see
if the changes made are *really* reflected in the object
Change-Id: Iff007e17df87148ea81e69d3567c8cf9857fdcaa
diff --git a/basic/qa/cppunit/test_nested_struct.cxx
b/basic/qa/cppunit/test_nested_struct.cxx
index 21b4913..91978e3 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -12,24 +12,40 @@
#include basic/sbmod.hxx
#include basic/sbmeth.hxx
+#include com/sun/star/awt/WindowDescriptor.hpp
+#include com/sun/star/table/TableBorder.hpp
+#include basic/sbuno.hxx
+
namespace
{
+using namespace com::sun::star;
class Nested_Struct : public BasicTestBase
{
public:
Nested_Struct() {};
void testAssign1();
+void testAssign1Alt(); // result is uno-ised and tested
void testOldAssign();
+void testOldAssignAlt(); // result is uno-ised and tested
void testUnfixedVarAssign();
+void testUnfixedVarAssignAlt(); // result is uno-ised and tested
void testFixedVarAssign();
+void testFixedVarAssignAlt(); // result is uno-ised and tested
+void testUnoAccess(); // fdo#60117 specific test
+
// Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(Nested_Struct);
// Declares the method as a test to call
CPPUNIT_TEST(testAssign1);
+CPPUNIT_TEST(testAssign1Alt);
CPPUNIT_TEST(testOldAssign);
+CPPUNIT_TEST(testOldAssignAlt);
CPPUNIT_TEST(testUnfixedVarAssign);
+CPPUNIT_TEST(testUnfixedVarAssignAlt);
CPPUNIT_TEST(testFixedVarAssign);
+CPPUNIT_TEST(testFixedVarAssignAlt);
+CPPUNIT_TEST(testUnoAccess);
// End of test suite definition
CPPUNIT_TEST_SUITE_END();
@@ -45,6 +61,14 @@ rtl::OUString sTestSource1(
End Function\n
);
+rtl::OUString sTestSource1Alt(
+Function simpleNestStructAccess() as Object\n
+Dim b0 as new \com.sun.star.table.TableBorder\\n
+b0.HorizontalLine.OuterLineWidth = 9\n
+simpleNestStructAccess = b0\n
+End Function\n
+);
+
// tests the old behaviour, we should still be able
// to use the old workaround of
// a) creating a new instance BorderLine,
@@ -61,6 +85,15 @@ rtl::OUString sTestSource2(
End Function\n
);
+rtl::OUString sTestSource2Alt(
+Function simpleRegressionTestOld()\n
+Dim b0 as new \com.sun.star.table.TableBorder\, l as new
\com.sun.star.table.BorderLine\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+simpleRegressionTestOld = b0\n
+End Function\n
+);
// it should be legal to assign a variant to a struct ( and copy by val )
// make sure we aren't copying by reference, we make sure that l is not
// a reference copy of b0.HorizontalLine, each one should have an
@@ -77,6 +110,20 @@ rtl::OUString sTestSource3(
End Function\n
);
+rtl::OUString sTestSource3Alt(
+Function testUnfixedVarAssign()\n
+Dim b0 as new \com.sun.star.table.TableBorder\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+l.OuterLineWidth = 4\n
+Dim result(1)\n
+result(0) = b0\n
+result(1) = l\n
+testUnfixedVarAssign = result\n
+End Function\n
+);
+
// nearly the same as above but this time for a fixed type
// variable
rtl::OUString sTestSource4(
@@ -90,6 +137,36 @@ rtl::OUString sTestSource4(
End Function\n
);
+rtl::OUString sTestSource4Alt(
+Function testFixedVarAssign()\n
+Dim b0 as new \com.sun.star.table.TableBorder\, l as new
\com.sun.star.table.BorderLine\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+l.OuterLineWidth = 4\n
+Dim result(1)\n
+result(0) = b0\n
+result(1) = l\n
+testFixedVarAssign = result\n
+End Function\n
+);
+
+// Although basic might appear to correctly change nested struct elements
+// fdo#60117 shows that basic can be fooled ( and even the watch(ed) variable
+// in the debugger shows the expected values )
+// We need to additionally check the actual uno struct to see if the
+// changes made are *really* reflected in the object
+rtl::OUString sTestSource5(
+
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/uwriter.cxx | 22 ++
sw/source/core/crsr/pam.cxx| 20 +++-
sw/source/core/text/inftxt.cxx |5 +
3 files changed, 42 insertions(+), 5 deletions(-)
New commits:
commit bd505fdb9f669f365ff39b0ef46f0742c638e333
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 11 12:59:49 2013 +0100
fdo#59573 position after fieldmark and before annotation anchor is read-only
Also revert SwTxtPaintInfo::_DrawBackBrush: draw dark border around
comment highlight (commit 57c8c34fcdc2d594d2da3593eb9d86d0daf4e18c), as
it draws confusing vertical lines inside the comment when it has
multiple runs.
Change-Id: If0f60e4a28878c2b31327ae3c04ae11470bc1f52
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 189a25c..5f94c84 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -91,6 +91,7 @@ public:
void testUserPerceivedCharCount();
void testGraphicAnchorDeletion();
void testFdo57938();
+void testFdo59573();
CPPUNIT_TEST_SUITE(SwDocTest);
CPPUNIT_TEST(randomTest);
@@ -102,6 +103,7 @@ public:
CPPUNIT_TEST(testUserPerceivedCharCount);
CPPUNIT_TEST(testGraphicAnchorDeletion);
CPPUNIT_TEST(testFdo57938);
+CPPUNIT_TEST(testFdo59573);
CPPUNIT_TEST_SUITE_END();
private:
@@ -896,6 +898,26 @@ void SwDocTest::testFdo57938()
CPPUNIT_ASSERT_EQUAL(false, aPaM.HasReadonlySel(false));
}
+void SwDocTest::testFdo59573()
+{
+SwNodeIndex aIdx(m_pDoc-GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+
+// Insert abc and create a fieldmark around b.
+OUString aTest(abc);
+m_pDoc-InsertString(aPaM, aTest);
+aPaM.SetMark();
+aPaM.GetPoint()-nContent = 1;
+aPaM.GetMark()-nContent = 2;
+IDocumentMarkAccess* pMarksAccess = m_pDoc-getIDocumentMarkAccess();
+pMarksAccess-makeFieldBookmark(aPaM, , ODF_COMMENTRANGE);
+aPaM.GetPoint()-nContent = 4;
+aPaM.GetMark()-nContent = 4;
+// The problem was that the position after the fieldmark end and before the
+// annotation anchor wasn't read-only.
+CPPUNIT_ASSERT_EQUAL(true, aPaM.HasReadonlySel(false));
+}
+
void SwDocTest::setUp()
{
BootstrapFixture::setUp();
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 741679e..85aedf0 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -687,9 +687,9 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
sw::mark::IMark* pB = NULL;
bool bUnhandledMark = false;
bool bCommentrangeMark = false;
+const IDocumentMarkAccess* pMarksAccess = pDoc-getIDocumentMarkAccess();
if ( pDoc )
{
-const IDocumentMarkAccess* pMarksAccess =
pDoc-getIDocumentMarkAccess( );
pA = GetPoint() ? pMarksAccess-getFieldmarkFor( *GetPoint( ) ) : NULL;
pB = GetMark( ) ? pMarksAccess-getFieldmarkFor( *GetMark( ) ) : pA;
@@ -730,6 +730,24 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
{
bRet = !( pA == pB pA != NULL );
}
+
+// Don't allow inserting characters between the 'field mark end' and
+// the 'comment anchor'.
+if (!bRet)
+{
+if (!pA GetPoint() GetPoint()-nNode.GetNode().IsTxtNode()
GetPoint()-nContent.GetIndex() 0)
+{
+// getFieldmarkFor() searches for = start and end, so check for
+// the previous character, to also get the fieldmark, if we're
+// exactly at the end.
+SwPosition aPrevChar(*GetPoint());
+aPrevChar.nContent--;
+sw::mark::IFieldmark* pFieldmark =
pMarksAccess-getFieldmarkFor(aPrevChar);
+if (pFieldmark pFieldmark-GetMarkEnd() == *GetPoint())
+bRet = true;
+}
+}
+
return bRet;
}
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 3696cb8..d67248a 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1119,15 +1119,12 @@ void SwTxtPaintInfo::_DrawBackBrush( const
SwLinePortion rPor ) const
const OUString rAuthor =
rPostItField.GetFld()-GetPar1();
sal_uInt16 nIndex =
pNd-GetDoc()-InsertRedlineAuthor(rAuthor);
pOutDev-SetFillColor(
SwPostItMgr::GetColorLight(nIndex) );
-pOutDev-SetLineColor(
SwPostItMgr::GetColorAnchor(nIndex) );
bFilled = true;
}
}
if (!bFilled)
-{
pOutDev-SetFillColor(
SwViewOption::GetFieldShadingsColor() );
-pOutDev-SetLineColor( );
-}
+pOutDev-SetLineColor( );
pOutDev-DrawRect( aIntersect.SVRect() );
pOutDev-Pop();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
Re: [PATCH] convert setup_native to gbuild and add to tail_build
Hi Peter, On Sat, Feb 9, 2013 at 3:54 PM, Peter Foley (via Code Review) ger...@gerrit.libreoffice.org wrote: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2063 I tested you patch and it does not work for me. Windows Installer cannot execure any of the CustomActions. E.g.: MSI (c) (9C:B0) [13:23:41:427]: Invoking remote custom action. DLL: C:\Users\timar\AppData\Local\Temp\MSIAF36.tmp, Entrypoint: SelectLanguage CustomAction SelectLanguage returned actual error code 1154 but will be translated to success due to continue marking The problem is that in newly built DLLs the names are mangled, I see _SelectLanguage@4 instead of SelectLanguage in Dependency Walker. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/fontmanager/fontconfig.cxx | 35 +++--
1 file changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 949bc0cbbcad19d1f4a9de0813c9eb83f79234cf
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 11 12:51:22 2013 +
Resolves: rhbz#527719 #i105784# improve selection of fallback font
Change-Id: Ib935ebd1609d4584d464e42fa418c2e91202e59b
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 0efdbe4..67506d8 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -832,7 +832,6 @@ namespace
#endif
}
-#if defined(ENABLE_DBUS) defined(ENABLE_PACKAGEKIT)
LanguageTag getExemplerLangTagForCodePoint(sal_uInt32 currentChar)
{
int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
@@ -844,6 +843,7 @@ namespace
return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(),
RTL_TEXTENCODING_UTF8));
}
+#if defined(ENABLE_DBUS) defined(ENABLE_PACKAGEKIT)
guint get_xid_for_dbus()
{
const Window *pTopWindow = Application::IsHeadlessModeEnabled() ? NULL
: Application::GetActiveTopWindow();
@@ -927,25 +927,32 @@ bool PrintFontManager::Substitute( FontSelectPattern
rPattern, rtl::OUString r
const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr();
FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8);
-const LanguageTag aLangTag(rPattern.meLanguage);
-const rtl::OString aLangAttrib = mapToFontConfigLangTag(aLangTag);
-if (!aLangAttrib.isEmpty())
-FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr());
+LanguageTag aLangTag(rPattern.meLanguage);
+OString aLangAttrib = mapToFontConfigLangTag(aLangTag);
// Add required Unicode characters, if any
if ( !rMissingCodes.isEmpty() )
{
- FcCharSet *unicodes = FcCharSetCreate();
- for( sal_Int32 nStrIndex = 0; nStrIndex rMissingCodes.getLength(); )
- {
- // also handle unicode surrogates
- const sal_uInt32 nCode = rMissingCodes.iterateCodePoints(
nStrIndex );
- FcCharSetAddChar( unicodes, nCode );
- }
- FcPatternAddCharSet(pPattern, FC_CHARSET, unicodes);
- FcCharSetDestroy(unicodes);
+FcCharSet *unicodes = FcCharSetCreate();
+for( sal_Int32 nStrIndex = 0; nStrIndex rMissingCodes.getLength(); )
+{
+// also handle unicode surrogates
+const sal_uInt32 nCode = rMissingCodes.iterateCodePoints(
nStrIndex );
+FcCharSetAddChar( unicodes, nCode );
+//#i105784#/rhbz#527719 improve selection of fallback font
+if (aLangAttrib.isEmpty())
+{
+aLangTag = getExemplerLangTagForCodePoint(nCode);
+aLangAttrib = mapToFontConfigLangTag(aLangTag);
+}
+}
+FcPatternAddCharSet(pPattern, FC_CHARSET, unicodes);
+FcCharSetDestroy(unicodes);
}
+if (!aLangAttrib.isEmpty())
+FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr());
+
addtopattern(pPattern, rPattern.GetSlant(), rPattern.GetWeight(),
rPattern.GetWidthType(), rPattern.GetPitch());
___
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' - postprocess/packcomponents scp2/source
postprocess/packcomponents/makefile.mk |4 ++-- scp2/source/ooo/file_library_ooo.scp |3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 92e7811ee757db41dc0b428aa1fe1f3ba3797bac Author: Michael Stahl mst...@redhat.com Date: Sat Feb 9 22:39:42 2013 +0100 fdo#60491: scp2: always package emboleobj library on non-WNT platforms (regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined DISABLE_ATL on all platforms in configure) (cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40) Conflicts: postprocess/Rdb_services.mk Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda Reviewed-on: https://gerrit.libreoffice.org/2095 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index fa3231c..a37ba73 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -224,12 +224,12 @@ my_components += \ .ENDIF -.IF $(DISABLE_ATL) == .IF $(OS) == WNT +.IF $(DISABLE_ATL) == my_components += component/embeddedobj/source/msole/emboleobj.windows +.ENDIF .ELSE my_components += component/embeddedobj/source/msole/emboleobj -.ENDIF .END .IF $(DISABLE_NEON) != TRUE diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 642cd81..6dd5e29 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) -#ifndef DISABLE_ATL +/* fdo#60491 always need emboleobj library on non-WNT platforms */ +#if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-dev] -calling a service function from BASIC macro
On 02/08/2013 04:08 PM, Rai, Neeraj wrote:
So the org.openoffice.sheet.addin.CalcAddinSock service you specified
implements a new UNO interface that you added (and which has a method
startThr), right?
Yes.
Did you bundle in your extension a types.rdb that
contains the information about that new interface?
No. But tried to change fundamentalrc SERVICE/TYPES rows to add
$ORIGIN/CalcAddinThr.rdb. scalc complained about duplicate entry.
I assumed that installing the extension informs scalc about my rdb. Maybe not?
I know about CORBA at conceptual level and how UNO works almost like
CORBA just better.
I don't understand how the unopkg and .rdb achieve that theory.
Specifically, where types.rdb fits.
I thought maybe unopkg add is similar to adding in types.rdb ?
Helping you would probably be easiest if you gave the full source code of your
extension,
along with short instructions how to build it (e.g., call make from
within a configured LO SDK environment).
attaching the code, makefile, and readme with instructions. to extract :
tar -zxvf CalcAddinThr.tgz
Attached CalcAddinThr.patch solves the problem. You inadvertently
registered the libCalcAddinThr.so UNO component both the old, active way
(by calling regcomp, which calls your component_writeInfo) and the new,
passive way (by providing a *.component file). You may want to also
remove the obsolete component_writeInfo implementation from your
CalcAddinThr_impl.cxx. (In order to test your code, I also needed an
explicit include of unistd.h for read(2), and drop some apparently dead
copy/paste stuff that caused additional compilation errors; I simply
included those changes in the attached patch.)
Stephan
diff -rNup CalcAddinThr-ORIG/CalcAddinSpread.cxx CalcAddinThr/CalcAddinSpread.cxx
--- CalcAddinThr-ORIG/CalcAddinSpread.cxx 2013-01-28 21:06:03.0 +0100
+++ CalcAddinThr/CalcAddinSpread.cxx 2013-02-11 13:44:07.084994239 +0100
@@ -2,6 +2,7 @@
#include stdio.h
#include sys/time.h
#include cerrno
+#include unistd.h
#include osl/thread.h
diff -rNup CalcAddinThr-ORIG/Makefile CalcAddinThr/Makefile
--- CalcAddinThr-ORIG/Makefile 2013-01-29 16:05:08.0 +0100
+++ CalcAddinThr/Makefile 2013-02-11 13:48:19.809852794 +0100
@@ -26,20 +26,7 @@ libCalcAddinThr.so: CalcAddinThr_impl.o
g++ -o libCalcAddinThr.so -shared \
-L$(OO_SDK_HOME)/lib -lpthread -luno_cppuhelpergcc3 CalcAddinThr_impl.o CalcAddinSpread.o
-## calc.uno.so is listed in calcuno.rdb. use make run to execute
-calc.uno.so : calcuno.cxx calcCommon.h
- gcc -c -fpic -fvisibility=hidden -O -I. -I $(OO_SDK_OUT)/LINUXexample.out/inc -I $(OO_SDK_OUT)/LINUXexample.out/inc/examples -I$(OO_SDK_HOME)/include -DUNX -DGCC -DLINUX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/lib/gcc/x86_64-redhat-linux/4.4.6/../../../../include/c++/4.4.6 -DHAVE_GCC_VISIBILITY_FEATURE -o calcuno.o calcuno.cxx
- g++ -shared '-Wl,-rpath,$ORIGIN' -L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib -o calc.uno.so calcuno.o \
- -luno_cppuhelpergcc3 -luno_cppu -luno_sal
-
-regcomp.flag: libCalcAddinThr.so
- $(OO_SDK_URE_HOME)/bin/regcomp -register -r CalcAddinThr.rdb -c libCalcAddinThr.so
- touch regcomp.flag
-
-calccli : calccli.cpp
- g++ -I /work/loc1/include/ calccli.cpp -g -o calccli -L /work/loc1/lib -lev -Wl,-rpath,/work/loc1/lib
-
-all: regcomp.flag calc.uno.so calccli
+all: libCalcAddinThr.so
install : all
/usr/bin/install -p libCalcAddinThr.so CalcAddinThr.rdb ${OFFICE_PROGRAM_PATH}/
@@ -51,5 +38,5 @@ run :
uno -env:URE_MORE_SERVICES=file://$(shell pwd)/calcuno.rdb -s com.sun.star.bridge.example.RemoteClientSample -- 1
clean:
- rm -rf com org *.o *.urd *.so *.flag *.oxt CalcAddinThr.rdb calccli
+ rm -rf com org *.o *.urd *.so *.flag *.oxt CalcAddinThr.rdb
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - more_fonts/fonts
more_fonts/fonts/fc_local.conf |1 - 1 file changed, 1 deletion(-) New commits: commit 5cb5d5c167d2d64abf16956bb525ca97ba0f48cd Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 1 06:09:00 2013 + lp#1034928: fontconfig: multiple family in alias isn't supported Having multiple family in alias isn't supported and may not work as expected Change-Id: Ifffa81db6829e7e21ff061276e1558dda6b99c71 Reviewed-on: https://gerrit.libreoffice.org/2100 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf index 973c7b5..c442c83 100644 --- a/more_fonts/fonts/fc_local.conf +++ b/more_fonts/fonts/fc_local.conf @@ -6,7 +6,6 @@ alias binding=same familyLiberation Sans Narrow/family - familyArial Narrow/family default familyArial Narrow/family /default ___ 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 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d52dbb974deca85f1e388c306a1302c49f2b57ee Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 11 15:23:43 2013 +0200 Remove SDK = 10.7 requirement for codesigning here, too Change-Id: I76498e121cf94142fbeedae1703fb49c0a9817ca diff --git a/configure.ac b/configure.ac index 1d91c29..feb6089 100644 --- a/configure.ac +++ b/configure.ac @@ -2734,7 +2734,7 @@ if test $_os = Darwin; then AC_MSG_CHECKING([whether to do code signing]) -if test \( -z $enable_macosx_code_signing -o $enable_macosx_code_signing = yes \) -a $MACOSX_SDK_VERSION -ge 1070; then +if test -z $enable_macosx_code_signing -o $enable_macosx_code_signing = yes; then # By default use the first suitable certificate (?). # http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin
scp2/source/base/folderitem_base.scp |3 scp2/source/calc/folderitem_calc.scp |3 scp2/source/draw/folderitem_draw.scp |3 scp2/source/impress/folderitem_impress.scp|3 scp2/source/math/folderitem_math.scp |3 scp2/source/ooo/common_brand.scp | 11 --- scp2/source/ooo/folderitem_ooo.scp| 13 +--- scp2/source/writer/folderitem_writer.scp |3 setup_native/Package_misc.mk |3 setup_native/source/win32/desktophelper.txt |1 setup_native/source/win32/get_retval.bat |3 setup_native/source/win32/patchlist.txt |2 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/globals.pm |2 solenv/bin/modules/installer/setupscript.pm | 31 - solenv/bin/modules/installer/windows/component.pm |7 -- solenv/bin/modules/installer/windows/file.pm | 24 --- solenv/bin/modules/installer/windows/registry.pm | 38 solenv/bin/modules/installer/windows/shortcut.pm | 69 -- solenv/bin/modules/t/installer-setupscript.t |1 20 files changed, 13 insertions(+), 212 deletions(-) New commits: commit aa2450cb51cfc3805c7a596b6b89d70bb133821e Author: Andras Timar ati...@suse.com Date: Mon Feb 11 14:26:34 2013 +0100 advertised shotrcuts The main goal of this patch was to simplify things. The LibreOffice version that goes to Intel AppUp use advertsied shourtcuts, because it is what Intel AppUp Center requires. We can reduce complexity a bit, if we use advertised shortcuts in normal builds, too. Change-Id: Ia35a753c83cb592137232428ab897a640e7ccc1f diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index c21c2a8..aefc128 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; -ModuleID = gid_Module_Prg_Base_Bin; +ModuleID = gid_Module_Brand_Prg_Base; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; IconFile = gid_File_Exe_Sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End #endif diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index f77258a..7fd14ef 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; -ModuleID = gid_Module_Prg_Calc_Bin; +ModuleID = gid_Module_Brand_Prg_Calc; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; IconFile = gid_File_Exe_Scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End #endif diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index 1fe1de2..76ce6c4 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; -ModuleID = gid_Module_Prg_Draw_Bin; +ModuleID = gid_Module_Brand_Prg_Draw; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; IconFile = gid_File_Exe_Sdraw; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End #endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 31c56ad..0f87196 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; -ModuleID = gid_Module_Prg_Impress_Bin; +ModuleID = gid_Module_Brand_Prg_Impress; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; IconFile = gid_File_Exe_Simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End #endif diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 3ad3b07..e12e799 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; -ModuleID = gid_Module_Prg_Math_Bin; +ModuleID = gid_Module_Brand_Prg_Math; FolderID =
Re: [PATCH] import different first page header/footer from doc
Hi Luke, Luke Deller (via Code Review) píše v So 09. 02. 2013 v 16:01 +: https://gerrit.libreoffice.org/2065 [...] import different first page header/footer from doc Just want to tell you that I am impressed with your import and export binary .doc patches - thank you so much for them! I especially appreciate that your changes remove lots of code, while implementing new functionality, and fixing bugs :-) Please - do you plan to continue in this direction, like fixes of .docx and .rtf first page handling too? Or do you have any other cool changes in Writer in mind? All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Comment translation german - english
Hi Matthias, Matthias Freund (via Code Review) píše v Ne 10. 02. 2013 v 19:37 +: Comment translation german - english Thank you a lot for your comment translations! Please don't hesitate to pack more translations into one commit, for comment translations it is not necessary to keep the changes small / local [as it is preferred for code changes, where there is some probability that the change might need to be reverted] - ie. it is just OK to translate several files [3-10 of them], and push them all as one commit. Keep up the great work :-) Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_nested_struct.cxx | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) New commits: commit 0ee3d79b98af3c249f47c77a0298a80f01300be5 Author: Noel Power noel.po...@suse.com Date: Mon Feb 11 13:58:33 2013 + blind wae fix for PPUNIT_ASSERT_EQUAL Change-Id: I0842e354fb766ebbbf2cff57a410a38fb8b8d3b1 diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx index 91978e3..c55f4b3 100644 --- a/basic/qa/cppunit/test_nested_struct.cxx +++ b/basic/qa/cppunit/test_nested_struct.cxx @@ -288,15 +288,16 @@ void Nested_Struct::testUnfixedVarAssignAlt() bool bRes = aRet = aResult; CPPUNIT_ASSERT_EQUAL(true, bRes ); +int result = aResult.getLength(); // should have 2 elements in a sequence returned -CPPUNIT_ASSERT_EQUAL(2, aResult.getLength() ); +CPPUNIT_ASSERT_EQUAL(2, result ); table::TableBorder aBorder; aResult[0] = aBorder; table::BorderLine aBorderLine; aResult[1] = aBorderLine; -int result = aBorder.HorizontalLine.OuterLineWidth; +result = aBorder.HorizontalLine.OuterLineWidth; CPPUNIT_ASSERT_EQUAL(9, result ); result = aBorderLine.OuterLineWidth; CPPUNIT_ASSERT_EQUAL(4, result ); @@ -341,15 +342,16 @@ void Nested_Struct::testFixedVarAssignAlt() bool bRes = aRet = aResult; CPPUNIT_ASSERT_EQUAL(true, bRes ); +int result = aResult.getLength(); // should have 2 elements in a sequence returned -CPPUNIT_ASSERT_EQUAL(2, aResult.getLength() ); +CPPUNIT_ASSERT_EQUAL(2, result ); table::TableBorder aBorder; aResult[0] = aBorder; table::BorderLine aBorderLine; aResult[1] = aBorderLine; -int result = aBorder.HorizontalLine.OuterLineWidth; +result = aBorder.HorizontalLine.OuterLineWidth; CPPUNIT_ASSERT_EQUAL(9, result ); result = aBorderLine.OuterLineWidth; CPPUNIT_ASSERT_EQUAL(4, result ); @@ -374,7 +376,8 @@ void Nested_Struct::testUnoAccess() awt::WindowDescriptor aWinDesc; aRet = aWinDesc; -CPPUNIT_ASSERT_EQUAL(200, aWinDesc.Bounds.X ); +int result = aWinDesc.Bounds.X; +CPPUNIT_ASSERT_EQUAL(200, result ); } // Put the test suite in the registry ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - android/sdremote l10ntools/source
android/sdremote/.gitignore |1 +
android/sdremote/Makefile|2 +-
android/sdremote/res/.gitignore |2 ++
l10ntools/source/lngmerge.cxx|4 ++--
l10ntools/source/stringmerge.cxx |1 +
5 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 049cf7c753339f761cd49b83744abab6aa820ea4
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Feb 11 15:05:43 2013 +0100
More quote escaping on translated strings.
Also escape single quotes for ulf, escape both double and single
quotes for stringex.
Change-Id: I4c9b8ea88c0172e0d2fdbc79c68bce34668a64f7
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 71f68ef..812c436 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -269,7 +269,7 @@ sal_Bool LngParser::Merge(
rtl::OString sText1( sLang );
sText1 += = \;
// escape quotes, unescape double escaped
quotes fdo#56648
-sText1 +=
sNewText.replaceAll(\,\\\).replaceAll(\,\\\);
+sText1 +=
sNewText.replaceAll(\,\\\).replaceAll(\,\\\).replaceAll(\',\\\').replaceAll(\',\\\');
sText1 += \;
*pLine = sText1;
Text[ sLang ] = sNewText;
@@ -307,7 +307,7 @@ sal_Bool LngParser::Merge(
sLine += sCur;
sLine += = \;
// escape quotes, unescape double escaped quotes
fdo#56648
-sLine +=
sNewText.replaceAll(\,\\\).replaceAll(\,\\\);
+sLine +=
sNewText.replaceAll(\,\\\).replaceAll(\,\\\).replaceAll(\',\\\').replaceAll(\',\\\');
sLine += \;
nLastLangPos++;
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 71909d9..26aabcb 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -161,6 +161,7 @@ void StringParser::Merge(
{
OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT, m_sLang );
+sNewText =
sNewText.replaceAll(\,quot;).replaceAll(\,\\\).replaceAll(\',apos;).replaceAll(\',\\\');
xmlNodeSetContent(
pCurrent,
xmlEncodeSpecialChars( NULL,
commit 63fdfd1eb63c1c1e17d3a62ea23b39bbeabfeae0
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Feb 11 15:04:51 2013 +0100
Filter out three-letter locales - aapt breaks there.
See
http://stackoverflow.com/questions/10330893/android-resources-for-languages-with-only-3-letter-codes
for some more background.
Change-Id: Ib8c62d008239de3f0ba35ebe17f8f6974f28beb1
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 1049e8d..3972a06 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -44,7 +44,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
endef
define android_get_langlist
-$(foreach lang,$(filter-out en-US,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo qtz nso
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
endef
$(eval $(call android_translations_rules,$(call android_get_langlist)))
commit 5b614cb2ac2643223c5be4e0d4df5515083b3781
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Feb 11 15:03:51 2013 +0100
Ignore more in-tree build output on android.
Change-Id: Icb6fb1ffab19f02d0af807d8f92201f1914ac08c
diff --git a/android/sdremote/.gitignore b/android/sdremote/.gitignore
new file mode 100644
index 000..b04e09d
--- /dev/null
+++ b/android/sdremote/.gitignore
@@ -0,0 +1 @@
+/translations*
diff --git a/android/sdremote/res/.gitignore b/android/sdremote/res/.gitignore
new file mode 100644
index 000..95f7438
--- /dev/null
+++ b/android/sdremote/res/.gitignore
@@ -0,0 +1,2 @@
+/values-*
+!/values-v10
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#59953 RTF import: fix unreadable graphic and nested cell...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2044 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2044 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a32ec2fcb0d1a8fca7a7bd26501d3daf17880c9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39370 - Fixed RTL/LTR and alignment buttons location on ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2077 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2077 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Issa Alkurtass ialkurt...@kacst.edu.sa Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#60491: embeddedobj: catch exception in fallback path
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2097
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/2097/1
fdo#60491: embeddedobj: catch exception in fallback path
This allows the OLE object to at least be passed to the OS for
opening...
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
(cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87)
---
M embeddedobj/source/msole/oleembed.cxx
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index b44d789..5c5b063 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -716,7 +716,14 @@
aArgs ), uno::UNO_QUERY_THROW );
uno::Reference io::XStream xCONTENTS;
-
xNameContainer-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CONTENTS)))
= xCONTENTS;
+try
+{
+xNameContainer-getByName(CONTENTS) = xCONTENTS;
+}
+catch (container::NoSuchElementException const)
+{
+// ignore
+}
sal_Bool bCopied = xCONTENTS.is()
lcl_CopyStream(xCONTENTS-getInputStream(), xStream-getOutputStream());
--
To view, visit https://gerrit.libreoffice.org/2097
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
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#60491: scp2: always package emboleobj library on non-WNT...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2098 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/2098/1 fdo#60491: scp2: always package emboleobj library on non-WNT platforms (regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined DISABLE_ATL on all platforms in configure) (cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40) Conflicts: postprocess/Rdb_services.mk Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda --- M postprocess/packcomponents/makefile.mk M scp2/source/ooo/file_library_ooo.scp 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 09e296b..eb073b5 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -223,12 +223,12 @@ .ENDIF -.IF $(DISABLE_ATL) == .IF $(OS) == WNT +.IF $(DISABLE_ATL) == my_components += component/embeddedobj/source/msole/emboleobj.windows +.ENDIF .ELSE my_components += component/embeddedobj/source/msole/emboleobj -.ENDIF .END .IF $(DISABLE_NEON) != TRUE diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 66c50e2..d56c071 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -413,7 +413,8 @@ SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) -#ifndef DISABLE_ATL +/* fdo#60491 always need emboleobj library on non-WNT platforms */ +#if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif -- To view, visit https://gerrit.libreoffice.org/2098 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda 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
[PUSHED] add unittest for fdo#59240
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2078 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2078 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic287228f578c9ecb0f69a47380c890e337203b31 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fix basic access to nested uno structures fdo#60117
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2099
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/2099/1
fix basic access to nested uno structures fdo#60117
Although basic might appear to correctly change nested struct elements
fdo#60117 shows that basic can be fooled ( and even the watch(ed) variable
in the debugger shows the expected values ). The problem stems from the
fact that the uno object held by basic isn't infact modified when changed
via the introspection uno service.
Additionally pimp the existing tests to check the actual uno struct to see
if the changes made are *really* reflected in the object
Change-Id: Iff007e17df87148ea81e69d3567c8cf9857fdcaa
---
M basic/qa/cppunit/test_nested_struct.cxx
M basic/source/classes/sbunoobj.cxx
2 files changed, 247 insertions(+), 8 deletions(-)
diff --git a/basic/qa/cppunit/test_nested_struct.cxx
b/basic/qa/cppunit/test_nested_struct.cxx
index 21b4913..91978e3 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -12,24 +12,40 @@
#include basic/sbmod.hxx
#include basic/sbmeth.hxx
+#include com/sun/star/awt/WindowDescriptor.hpp
+#include com/sun/star/table/TableBorder.hpp
+#include basic/sbuno.hxx
+
namespace
{
+using namespace com::sun::star;
class Nested_Struct : public BasicTestBase
{
public:
Nested_Struct() {};
void testAssign1();
+void testAssign1Alt(); // result is uno-ised and tested
void testOldAssign();
+void testOldAssignAlt(); // result is uno-ised and tested
void testUnfixedVarAssign();
+void testUnfixedVarAssignAlt(); // result is uno-ised and tested
void testFixedVarAssign();
+void testFixedVarAssignAlt(); // result is uno-ised and tested
+void testUnoAccess(); // fdo#60117 specific test
+
// Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(Nested_Struct);
// Declares the method as a test to call
CPPUNIT_TEST(testAssign1);
+CPPUNIT_TEST(testAssign1Alt);
CPPUNIT_TEST(testOldAssign);
+CPPUNIT_TEST(testOldAssignAlt);
CPPUNIT_TEST(testUnfixedVarAssign);
+CPPUNIT_TEST(testUnfixedVarAssignAlt);
CPPUNIT_TEST(testFixedVarAssign);
+CPPUNIT_TEST(testFixedVarAssignAlt);
+CPPUNIT_TEST(testUnoAccess);
// End of test suite definition
CPPUNIT_TEST_SUITE_END();
@@ -42,6 +58,14 @@
Dim b0 as new \com.sun.star.table.TableBorder\\n
b0.HorizontalLine.OuterLineWidth = 9\n
simpleNestStructAccess = b0.HorizontalLine.OuterLineWidth\n
+End Function\n
+);
+
+rtl::OUString sTestSource1Alt(
+Function simpleNestStructAccess() as Object\n
+Dim b0 as new \com.sun.star.table.TableBorder\\n
+b0.HorizontalLine.OuterLineWidth = 9\n
+simpleNestStructAccess = b0\n
End Function\n
);
@@ -61,6 +85,15 @@
End Function\n
);
+rtl::OUString sTestSource2Alt(
+Function simpleRegressionTestOld()\n
+Dim b0 as new \com.sun.star.table.TableBorder\, l as new
\com.sun.star.table.BorderLine\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+simpleRegressionTestOld = b0\n
+End Function\n
+);
// it should be legal to assign a variant to a struct ( and copy by val )
// make sure we aren't copying by reference, we make sure that l is not
// a reference copy of b0.HorizontalLine, each one should have an
@@ -77,6 +110,20 @@
End Function\n
);
+rtl::OUString sTestSource3Alt(
+Function testUnfixedVarAssign()\n
+Dim b0 as new \com.sun.star.table.TableBorder\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+l.OuterLineWidth = 4\n
+Dim result(1)\n
+result(0) = b0\n
+result(1) = l\n
+testUnfixedVarAssign = result\n
+End Function\n
+);
+
// nearly the same as above but this time for a fixed type
// variable
rtl::OUString sTestSource4(
@@ -89,6 +136,36 @@
testFixedVarAssign = b0.HorizontalLine.OuterLineWidth +
l.OuterLineWidth\n
End Function\n
);
+
+rtl::OUString sTestSource4Alt(
+Function testFixedVarAssign()\n
+Dim b0 as new \com.sun.star.table.TableBorder\, l as new
\com.sun.star.table.BorderLine\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+l.OuterLineWidth = 4\n
+Dim result(1)\n
+result(0) = b0\n
+result(1) = l\n
+testFixedVarAssign = result\n
+End Function\n
+);
+
+// Although basic might appear to correctly change nested struct elements
+// fdo#60117 shows that basic can be fooled ( and even the watch(ed) variable
+// in the debugger shows the expected values )
+// We need to additionally check the actual uno struct to see if the
+// changes made are *really* reflected in the object
+rtl::OUString sTestSource5(
+Function testUnoAccess() as Object\n
+Dim aWinDesc as
[PUSHED libreoffice-4-0] fdo#60491: scp2: always package emboleobj library on non-WNT...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2095 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2095 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
