[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgstyleattributes.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 3d3401a6397e893808309ec374f5d8f890144906
Author: Joren De Cuyper jore...@libreoffice.org
Date: Tue Jul 22 13:19:42 2014 +0200
Revert fdo#74743 avoid infinite loop when gathering svg element styles
This reverts commit 3b7472b284131c09d91b69f26d5d26d54648f939.
Commit 0879a639bc7c734f0847f74b965809f9107b3195 didn't
revert all changes, so we ran into problems getting the
css style correctly.
Conflicts:
svgio/source/svgreader/svgstyleattributes.cxx
svgio/source/svgreader/svgsvgnode.cxx
Change-Id: I4d17c6d599482de005c009638d03ca851491f700
Reviewed-on: https://gerrit.libreoffice.org/10455
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index cc9d40c..9c24753 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -203,15 +203,16 @@ namespace svgio
const SvgStyleAttributes* SvgStyleAttributes::getParentStyle() const
{
-const SvgStyleAttributes* pParentStyle = getCssStyleParent();
+if(getCssStyleParent())
+{
+return getCssStyleParent();
+}
-if(mrOwner.supportsParentStyle() mrOwner.getParent())
+if(mrOwner.getParent())
{
return mrOwner.getParent()-getSvgStyleAttributes();
}
-if (pParentStyle != this) // to prevent infinite loop
-return pParentStyle;
return NULL;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/txtnode/atrfld.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 2f2e914703ad45598ae51dcaed82c6c6ec49fb83
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jul 22 10:39:40 2014 +
125296: correction of fix for issue 125044
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index a6cad4c..97a93ca 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const
const SwField* pFld = GetFmtFld().GetField();
const XubString aNewExpand(
pFld-ExpandField(m_pTxtNode-GetDoc()-IsClipBoard()) );
-if ( !bForceNotify
- aNewExpand == m_aExpand )
+if ( aNewExpand == m_aExpand )
{
// Bei Seitennummernfeldern
const sal_uInt16 nWhich = pFld-GetTyp()-Which();
@@ -372,7 +371,11 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify )
const
{
m_pTxtNode-ModifyNotification( 0, 0 );
}
-return;
+if ( !bForceNotify )
+{
+// done, if no further notification forced.
+return;
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit bdbf6cee5a3a012412699dba103b9f6430084722
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jul 22 14:01:40 2014 +0200
fdo#79221: Wrong rendering of bottom and right character border
Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0.
SetMirrorWidths() works only when there are two lines
(double border), but breaks one line borders.
Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index df5d953..6c7631c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5084,7 +5084,8 @@ void PaintCharacterBorder(
if( aBottomBorder )
{
-aBottomBorder-SetMirrorWidths(true);
+if( aBottomBorder-isDouble() )
+aBottomBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Left(),
@@ -5122,7 +5123,8 @@ void PaintCharacterBorder(
if( aRightBorder )
{
-aRightBorder-SetMirrorWidths(true);
+if( aRightBorder-isDouble() )
+aRightBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #43 from Dominik d0m1...@gmx.net --- i nominate https://bugs.freedesktop.org/show_bug.cgi?id=73678 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #44 from Dominik d0m1...@gmx.net --- nominating https://bugs.freedesktop.org/show_bug.cgi?id=75940 and https://bugs.freedesktop.org/show_bug.cgi?id=60428 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #45 from Dominik d0m1...@gmx.net --- addendum: all three are regressions. first one covering lost conditional formatting’s, 2nd too and the third is about the duplex print setting which is ignored since about 4.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 79221, which changed state. Bug 79221 Summary: Border down and right don't have good view, but good export in PDF https://bugs.freedesktop.org/show_bug.cgi?id=79221 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #46 from Dominik d0m1...@gmx.net --- further i nominate https://bugs.freedesktop.org/show_bug.cgi?id=70653 EDITING: impossible to change existing math catalog element's font face without its name auto-switched to Unicode value as it's a regression and exists since 3.4.6 and is even worse since #80650 , because it would provide a work-around. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 79221, which changed state. Bug 79221 Summary: Border down and right don't have good view, but good export in PDF https://bugs.freedesktop.org/show_bug.cgi?id=79221 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/svx svx/inc svx/source
editeng/source/editeng/impedit3.cxx |4 +-
include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx |2 -
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 27 +++
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |5 +++
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx| 23
5 files changed, 58 insertions(+), 3 deletions(-)
New commits:
commit 7427a65ad93a68ac3814d8c88f831474194351c0
Author: matteocam matteo.campane...@gmail.com
Date: Tue Jul 22 15:57:18 2014 +0300
Basic SdrChainedTextPrimitive2D class definition
Change-Id: I3bab06d061b1bde6804c0d539df3cf81bb363857
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 196d0ee..77264b4 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -542,8 +542,8 @@ void ImpEditEngine::CheckAutoPageSize()
SetValidPaperSize( aPaperSize );// consider Min, Max
// FIXME(matteocam)
-fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
-? YES Overflow!\n : NO Overflow!\n );
+/* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
+? YES Overflow!\n : NO Overflow!\n ); */
// setting overflow status
if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) )
aStatus.SetPageOverflow(true);
diff --git a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
index 0fae52a..cc7aca0 100644
--- a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
@@ -48,7 +48,7 @@
#define PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D
(PRIMITIVE2D_ID_RANGE_SVX| 21)
#define PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D
(PRIMITIVE2D_ID_RANGE_SVX| 22)
#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D
(PRIMITIVE2D_ID_RANGE_SVX| 23)
-
+#define PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D
(PRIMITIVE2D_ID_RANGE_SVX| 24)
#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index fa8a13f..44b82ae 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -331,6 +331,33 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
+namespace drawinglayer
+{
+namespace primitive2d
+{
+class SdrChainedTextPrimitive2D : public SdrTextPrimitive2D
+{
+private:
+// XXX: might have position of overflowing text
+protected:
+// local decomposition.
+virtual Primitive2DSequence create2DDecomposition(const
geometry::ViewInformation2D aViewInformation) const SAL_OVERRIDE;
+
+public:
+SdrChainedTextPrimitive2D(
+const SdrText* pSdrText,
+const OutlinerParaObject rOutlinerParaObjectPtrs);
+
+// get data
+
+// compare operator
+//virtual bool operator==(const BasePrimitive2D rPrimitive) const
SAL_OVERRIDE;
+
+// provide unique ID
+DeclPrimitive2DIDBlock()
+};
+} // end of namespace primitive2d
+} // end of namespace drawinglayer
#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index a12ff99..7e2a705 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -302,6 +302,11 @@ namespace drawinglayer
}
else if(rText.isAutoFit())
{
+// FIXME(matteocam)
+bool b = false;
+if (b)
+pNew = new SdrChainedTextPrimitive2D(
rText.getSdrText(), rText.getOutlinerParaObject() );
+else // end FIXME
// isotrophically scaled text in range
pNew = new SdrAutoFitTextPrimitive2D(rText.getSdrText(),
rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap);
}
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 158a0d0..8ba2909 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -480,6 +480,29 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
+namespace drawinglayer
+{
+namespace primitive2d
+{
+
+SdrChainedTextPrimitive2D::SdrChainedTextPrimitive2D(
+const SdrText* pSdrText,
+const OutlinerParaObject rOutlinerParaObject)
+: SdrTextPrimitive2D(pSdrText,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/layout/paintfrm.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 17e55304319a6046e649adcfc5d3fbd573d5d43e
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jul 22 14:01:40 2014 +0200
fdo#79221: Wrong rendering of bottom and right character border
Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0.
SetMirrorWidths() works only when there are two lines
(double border), but breaks one line borders.
Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9
(cherry picked from commit bdbf6cee5a3a012412699dba103b9f6430084722)
Reviewed-on: https://gerrit.libreoffice.org/10456
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 3e4ed87..3098638 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5080,7 +5080,8 @@ void PaintCharacterBorder(
if( aBottomBorder )
{
-aBottomBorder-SetMirrorWidths(true);
+if( aBottomBorder-isDouble() )
+aBottomBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Left(),
@@ -5118,7 +5119,8 @@ void PaintCharacterBorder(
if( aRightBorder )
{
-aRightBorder-SetMirrorWidths(true);
+if( aRightBorder-isDouble() )
+aRightBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/layout/paintfrm.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9ea31dcd4adb22c441c147c8078604ee7ab5bfe3
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jul 22 14:01:40 2014 +0200
fdo#79221: Wrong rendering of bottom and right character border
Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0.
SetMirrorWidths() works only when there are two lines
(double border), but breaks one line borders.
Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9
(cherry picked from commit bdbf6cee5a3a012412699dba103b9f6430084722)
Reviewed-on: https://gerrit.libreoffice.org/10457
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 0217c3b..49dbce4 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4996,7 +4996,8 @@ void PaintCharacterBorder(
if( aBottomBorder )
{
-aBottomBorder-SetMirrorWidths(true);
+if( aBottomBorder-isDouble() )
+aBottomBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Left(),
@@ -5034,7 +5035,8 @@ void PaintCharacterBorder(
if( aRightBorder )
{
-aRightBorder-SetMirrorWidths(true);
+if( aRightBorder-isDouble() )
+aRightBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/atrfld.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a9c17adf9a7c3ff510b62e791dbf322cb82243d9
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jul 22 10:39:40 2014 +
Resolves: #i125296# correction of fix for issue #i125044#
(cherry picked from commit 2f2e914703ad45598ae51dcaed82c6c6ec49fb83)
Conflicts:
sw/source/core/txtnode/atrfld.cxx
Change-Id: I7519a2b985da603618a345d5549f73c9abd17101
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index 76330ce..7329b87 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -336,8 +336,7 @@ void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const
const SwField* pFld = GetFmtFld().GetField();
const OUString aNewExpand(
pFld-ExpandField(m_pTxtNode-GetDoc()-IsClipBoard()) );
-if (!bForceNotify
-aNewExpand == m_aExpand)
+if (aNewExpand == m_aExpand)
{
// Bei Seitennummernfeldern
const sal_uInt16 nWhich = pFld-GetTyp()-Which();
@@ -353,7 +352,11 @@ void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const
{
m_pTxtNode-ModifyNotification( 0, 0 );
}
-return;
+if ( !bForceNotify )
+{
+// done, if no further notification forced.
+return;
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/2e914703ad45598ae51dcaed82c6c6ec49fb83
2f/2e914703ad45598ae51dcaed82c6c6ec49fb83 |1 + 1 file changed, 1 insertion(+) New commits: commit 38598e45c2b871f65f47b6d086e7c74b0e8275b9 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 14:36:04 2014 +0100 Notes added by 'git notes add' diff --git a/2f/2e914703ad45598ae51dcaed82c6c6ec49fb83 b/2f/2e914703ad45598ae51dcaed82c6c6ec49fb83 new file mode 100644 index 000..8e3fe9e --- /dev/null +++ b/2f/2e914703ad45598ae51dcaed82c6c6ec49fb83 @@ -0,0 +1 @@ +merged as: a9c17adf9a7c3ff510b62e791dbf322cb82243d9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/model/main/DataPointProperties.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15eb6b2e0161125e36357afcf64d27a9ca5c9d22 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Jul 22 09:35:19 2014 -0400 Wrong indent. Change-Id: I0aab6cc1d7a39928e9e8ffd6ae23fcfad42ceae3 diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 5c89424..58d15f1 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -313,7 +313,7 @@ void DataPointProperties::AddPropertiesToVector( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); -rOutProperties.push_back( +rOutProperties.push_back( Property( TextRotation, PROP_DATAPOINT_TEXT_ROTATION, cppu::UnoTypedouble::get(), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source vcl/source
include/sfx2/dinfdlg.hxx | 14 +
sfx2/source/dialog/dinfdlg.cxx | 63 -
vcl/source/window/tabpage.cxx | 11 ---
3 files changed, 60 insertions(+), 28 deletions(-)
New commits:
commit aff263c8b814c6bf352312403d3c1e448c8013a3
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 22 14:25:51 2014 +0100
Related: fdo#81457 quadratic time required when setting a11y name
when calling SetAccessibleName GetAccessibleName is called
in order to send a name changed a11y event. Getting an Accessible
Name is very slow in a non-layout aware widget because it scans
for a nearby label and there is none in this widget, but it
has a huge pile of other widgets to iterate over.
call add_mnemonic_label before hand to cut off that entire
branch.
While we're at it, only call InitControl to adjust to a new
width if the new width is different from the old width
Change-Id: Ie4ba1276127226e49442278e46447b84bbeb1cde
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index d433cb4..fd6f95b 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -407,6 +407,10 @@ struct CustomPropertyLine
class CustomPropertiesWindow : public Window
{
private:
+FixedText* m_pHeaderAccName;
+FixedText* m_pHeaderAccType;
+FixedText* m_pHeaderAccValue;
+
ComboBoxm_aNameBox;
ListBox m_aTypeBox;
Editm_aValueEdit;
@@ -441,13 +445,13 @@ private:
public:
CustomPropertiesWindow(Window* pParent,
-const OUString rHeaderAccName,
-const OUString rHeaderAccType,
-const OUString rHeaderAccValue);
+FixedText *pHeaderAccName,
+FixedText *pHeaderAccType,
+FixedText *pHeaderAccValue);
virtual ~CustomPropertiesWindow();
-voidInitControls( HeaderBar* pHeaderBar, const ScrollBar*
pScrollBar );
-sal_uInt16 GetVisibleLineCount() const;
+boolInitControls( HeaderBar* pHeaderBar, const ScrollBar*
pScrollBar );
+sal_uInt16 GetVisibleLineCount() const;
inline sal_Int32GetLineHeight() const { return m_nLineHeight; }
voidAddLine( const OUString sName,
com::sun::star::uno::Any rAny );
boolAreAllLinesValid() const;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 7073d5a..f0fc12e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1354,10 +1354,13 @@ void CustomPropertyLine::SetRemoved()
}
CustomPropertiesWindow::CustomPropertiesWindow(Window* pParent,
-const OUString rHeaderAccName,
-const OUString rHeaderAccType,
-const OUString rHeaderAccValue) :
+FixedText *pHeaderAccName,
+FixedText *pHeaderAccType,
+FixedText *pHeaderAccValue) :
Window(pParent),
+m_pHeaderAccName(pHeaderAccName),
+m_pHeaderAccType(pHeaderAccType),
+m_pHeaderAccValue(pHeaderAccValue),
m_aNameBox ( this, SfxResId( SFX_CB_PROPERTY_NAME ) ),
m_aTypeBox ( this, SfxResId( SFX_LB_PROPERTY_TYPE ) ),
m_aValueEdit( this, SfxResId( SFX_ED_PROPERTY_VALUE ) ),
@@ -1378,9 +1381,12 @@ CustomPropertiesWindow::CustomPropertiesWindow(Window*
pParent,
m_aBoxLoseFocusTimer.SetTimeout( 300 );
m_aBoxLoseFocusTimer.SetTimeoutHdl( LINK( this, CustomPropertiesWindow,
BoxTimeoutHdl ) );
-m_aNameBox.SetAccessibleName(rHeaderAccName);
-m_aTypeBox.SetAccessibleName(rHeaderAccType);
-m_aValueEdit.SetAccessibleName(rHeaderAccValue);
+m_aNameBox.add_mnemonic_label(m_pHeaderAccName);
+m_aNameBox.SetAccessibleName(m_pHeaderAccName-GetText());
+m_aTypeBox.add_mnemonic_label(m_pHeaderAccType);
+m_aTypeBox.SetAccessibleName(m_pHeaderAccType-GetText());
+m_aValueEdit.add_mnemonic_label(m_pHeaderAccValue);
+m_aValueEdit.SetAccessibleName(m_pHeaderAccValue-GetText());
m_aNameBox.Hide();
m_aTypeBox.Hide();
@@ -1546,8 +1552,10 @@ void CustomPropertiesWindow::ValidateLine(
CustomPropertyLine* pLine, bool bIsFr
}
}
-void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const
ScrollBar* pScrollBar )
+bool CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const
ScrollBar* pScrollBar )
{
+bool bChanged = false;
+
DBG_ASSERT( pHeaderBar, CustomPropertiesWindow::InitControls(): invalid
headerbar );
DBG_ASSERT( pScrollBar, CustomPropertiesWindow::InitControls(): invalid
scrollbar );
@@ -1568,14 +1576,21 @@ void CustomPropertiesWindow::InitControls( HeaderBar*
pHeaderBar, const ScrollBa
while ( *pCurrent )
{
Rectangle aRect = pHeaderBar-GetItemRect( pHeaderBar-GetItemId(
nPos++ ) );
-Size aSize = (*pCurrent)-GetSizePixel();
-Point aPos
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - connectivity/source
connectivity/source/parse/sqlbison.y |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit e973c9ce30668be20994454bd974416415426a73 Author: Lionel Elie Mamane lio...@mamane.lu Date: Sat Jul 19 07:45:20 2014 +0200 fdo#81336 bison priority increase with bigger number Change-Id: Ib99f08c52379fd9df90c30b61cc246ee53022506 Reviewed-on: https://gerrit.libreoffice.org/10404 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 3484b0d..0a3772f 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1155,12 +1155,12 @@ search_condition: } ; predicate: - comparison_predicate %dprec 2 + comparison_predicate %dprec 1 | between_predicate | all_or_any_predicate | existence_test | unique_test - | test_for_null%dprec 1 + | test_for_null%dprec 2 | in_predicate | like_predicate ; @@ -3950,11 +3950,11 @@ when_operand_list: ; when_operand: row_value_constructor_elem - | comparison_predicate_part_2%dprec 2 + | comparison_predicate_part_2%dprec 1 | between_predicate_part_2 | in_predicate_part_2 | character_like_predicate_part_2 - | null_predicate_part_2 %dprec 1 + | null_predicate_part_2 %dprec 2 ; searched_when_clause_list: searched_when_clause ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 79221, which changed state. Bug 79221 Summary: Border down and right don't have good view, but good export in PDF https://bugs.freedesktop.org/show_bug.cgi?id=79221 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/source
sc/source/filter/xml/xmlexprt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c4ad8f54e39d40b58223bcac99510d9798b7cdda Author: Eike Rathke er...@redhat.com Date: Mon Jul 21 19:10:12 2014 +0200 use SvXMLExport::GetRelativeReference(), fdo#79305 Change-Id: I1e92a87034cf31470a9d8809f3b543b154c65126 Reviewed-on: https://gerrit.libreoffice.org/10446 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Reviewed-by: Muthu Subramanian K muthus...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 058e719..2e73236 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3080,7 +3080,7 @@ void writeContent( // text:a xlink:href=url xlink:type=simplevalue/text:a OUString aURL = static_castconst SvxURLField*(pField)-GetURL(); -rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aURL); +rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(aURL)); rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, simple); OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/source
sc/source/core/tool/token.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 9e83928e4dd65a1cf570f9cea65f456bd089ea33
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 11 23:15:50 2014 +0200
resolved fdo#77018 keep external references intact during sort
Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to
work.
Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60
(cherry picked from commit db0a4c2575ffba1c170d74882b0f5a6229ec072f)
Reviewed-on: https://gerrit.libreoffice.org/10246
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8f51a72..ab47bee 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -531,6 +531,9 @@ bool ScToken::Is3DRef() const
if ( GetSingleRef().IsFlag3D() )
return true;
break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
+return true;
default:
{
// added to avoid warnings
@@ -2251,6 +2254,20 @@ void ScTokenArray::ReadjustRelative3DReferences( const
ScAddress rOldPos,
}
}
break;
+case svExternalDoubleRef :
+{
+ScSingleRefData rRef2 =
static_castScToken*(pCode[j])-GetSingleRef2();
+ScAddress aAbs = rRef2.toAbs(rOldPos);
+rRef2.SetAddress(aAbs, rNewPos);
+}
+//! fallthru
+case svExternalSingleRef :
+{
+ScSingleRefData rRef1 =
static_castScToken*(pCode[j])-GetSingleRef();
+ScAddress aAbs = rRef1.toAbs(rOldPos);
+rRef1.SetAddress(aAbs, rNewPos);
+}
+break;
default:
{
// added to avoid warnings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/inc sc/source
sc/inc/formulacell.hxx |2 +-
sc/source/core/data/formulacell.cxx |4 ++--
sc/source/core/data/table3.cxx |3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 8c215cdd57dac801a255c84c41c9fd8be5ff8f19
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 11 18:35:39 2014 +0200
resolved fdo#79441 keep 3D references intact during sort
Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888
(cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1)
Reviewed-on: https://gerrit.libreoffice.org/10241
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 326c4b8..2d25c9b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -160,7 +160,7 @@ public:
~ScFormulaCell();
ScFormulaCell* Clone() const;
-ScFormulaCell* Clone( const ScAddress rPos ) const;
+ScFormulaCell* Clone( const ScAddress rPos, int nCloneFlags ) const;
ScFormulaCell( ScDocument* pDoc, const ScAddress rPos );
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index d4324a3..1397372 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -837,9 +837,9 @@ ScFormulaCell* ScFormulaCell::Clone() const
return new ScFormulaCell(*this, *pDocument, aPos);
}
-ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos ) const
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos, int nCloneFlags )
const
{
-return new ScFormulaCell(*this, *pDocument, rPos);
+return new ScFormulaCell(*this, *pDocument, rPos, nCloneFlags);
}
size_t ScFormulaCell::GetHash() const
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5fceab2..6a169ef 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -682,7 +682,8 @@ void ScTable::SortReorderByRow( ScSortInfoArray* pArray,
ScProgress* pProgress )
{
assert(rCell.mpAttr);
size_t n = rCellStore.size();
-sc::CellStoreType::iterator itBlk =
rCellStore.push_back(rCell.maCell.mpFormula-Clone(aCellPos));
+sc::CellStoreType::iterator itBlk = rCellStore.push_back(
rCell.maCell.mpFormula-Clone(
+aCellPos, SC_CLONECELL_DEFAULT |
SC_CLONECELL_ADJUST3DREL));
// Join the formula cells as we fill the container.
size_t nOffset = n - itBlk-position;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/source
sw/source/core/layout/paintfrm.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b2f8d4bf169b97c0022bb2a2331466c17662bad8
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jul 22 14:01:40 2014 +0200
fdo#79221: Wrong rendering of bottom and right character border
Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0.
SetMirrorWidths() works only when there are two lines
(double border), but breaks one line borders.
Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9
(cherry picked from commit bdbf6cee5a3a012412699dba103b9f6430084722)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 3e4ed87..3098638 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5080,7 +5080,8 @@ void PaintCharacterBorder(
if( aBottomBorder )
{
-aBottomBorder-SetMirrorWidths(true);
+if( aBottomBorder-isDouble() )
+aBottomBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Left(),
@@ -5118,7 +5119,8 @@ void PaintCharacterBorder(
if( aRightBorder )
{
-aRightBorder-SetMirrorWidths(true);
+if( aRightBorder-isDouble() )
+aRightBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ridljar/com
ridljar/com/sun/star/uno/Any.java| 66 ++-
ridljar/com/sun/star/uno/Enum.java |5 -
ridljar/com/sun/star/uno/IMemberDescription.java |5 -
ridljar/com/sun/star/uno/IMethodDescription.java |6 --
ridljar/com/sun/star/uno/ITypeDescription.java | 14
ridljar/com/sun/star/uno/Type.java | 26 -
ridljar/com/sun/star/uno/Union.java |3 -
ridljar/com/sun/star/uno/UnoRuntime.java |2
8 files changed, 70 insertions(+), 57 deletions(-)
New commits:
commit 0340e62fc9fa78cfe0a6718ac07f1ba31260ff5c
Author: rbuj robert@gmail.com
Date: Tue Jul 22 12:33:50 2014 +0200
ridljar: javadoc Override
Javadoc: apply formatting and remove the warning empty p tag.
@Override public String toString()
@Override public boolean equals(Object obj)
@Override public int hashCode()
Change-Id: I64b63d01015535d386ac584831c4ef6e371e863d
Reviewed-on: https://gerrit.libreoffice.org/10453
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/ridljar/com/sun/star/uno/Any.java
b/ridljar/com/sun/star/uno/Any.java
index ba1d9f6..8da2bfb 100644
--- a/ridljar/com/sun/star/uno/Any.java
+++ b/ridljar/com/sun/star/uno/Any.java
@@ -28,19 +28,19 @@ package com.sun.star.uno;
* an interprocess connection using an any, you should use this class to add
* an explicit interface type, so the remote counterpart doesn't need to invoke
* a queryInterface).
- * p
+ * /p
*/
public class Any {
/**
* The type of the any.
- * p
+ *
* @see #getType
*/
protected Type _type;
/**
* The data of the any.
- * p
+ *
* @see #getObject
*/
protected Object _object;
@@ -52,7 +52,7 @@ public class Any {
/**
* Constructs a new any.
- * p
+ *
* @param zInterface the type of the any.
* @param object the data of the any.
* @deprecated as of UDK 2.0
@@ -61,9 +61,11 @@ public class Any {
this(new Type(zInterface), object);
}
-/** Constructs a new any with a given type and value
-@param type the UNO type of the any.
-@param object the value of the any.
+/**
+ * Constructs a new any with a given type and value
+ *
+ * @param type the UNO type of the any.
+ * @param object the value of the any.
*/
public Any(Type type, Object object) {
if (type.equals(Type.ANY)) {
@@ -74,15 +76,13 @@ public class Any {
}
/**
- Complete a UNO codeANY/code (make sure it is wrapped up as an
- codeAny/code instance).
-
- @param any a Java value representing a UNO codeANY/code value.
-
- @return a complete Java value (that is, an codeAny/code instance)
- representing the same UNO codeANY/code value as the given argument.
-
- @since UDK 3.2.3
+ * Complete a UNO codeANY/code (make sure it is wrapped up as an
+ * codeAny/code instance).
+ *
+ * @param any a Java value representing a UNO codeANY/code value.
+ * @return a complete Java value (that is, an codeAny/code instance)
+ * representing the same UNO codeANY/code value as the given argument.
+ * @since UDK 3.2.3
*/
public static final Any complete(Object any) {
return any instanceof Any
@@ -93,8 +93,8 @@ public class Any {
/**
* Gets the type of the value within the any.
- * p
- * @return the type of the value within the any.
+ *
+ * @return the type of the value within the any.
*/
public Type getType() {
return _type;
@@ -102,14 +102,22 @@ public class Any {
/**
* Gets the value within the any.
- * p
- * @return gets the value within the any.
+ *
+ * @return gets the value within the any.
*/
public Object getObject() {
return _object;
}
-// @see java.lang.Object#equals
+/**
+ * Indicates whether some other object is equal to this one.
+ *
+ * @param obj the reference object with which to compare.
+ * @return codetrue/code if this object is the same as the obj
argument;
+ * codefalse/code otherwise.
+ * @see java.lang.Object#equals
+ */
+@Override
public boolean equals(Object obj) {
return obj instanceof Any _type.equals(((Any) obj)._type)
(_object == null
@@ -117,13 +125,25 @@ public class Any {
: _object.equals(((Any) obj)._object));
}
-// @see java.lang.Object#hashCode
+/**
+ * Returns a hash code value for the object.
+ *
+ * @return a hash code value for this object.
+ * @see java.lang.Object#hashCode
+ */
+@Override
public int hashCode() {
return _type.hashCode() * 13
+ (_object == null ? 0 : _object.hashCode());
}
-// @see java.lang.Object#toString
+
[Libreoffice-commits] core.git: include/tools
include/tools/ref.hxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 3f8a921471d8ed5423fb572a076d882392c77dba
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 16:23:59 2014 +0200
remove dead code
Change-Id: I0d3d1a14d8eb880a5a054fe2e736f8ac97f8b727
Reviewed-on: https://gerrit.libreoffice.org/10284
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 1d5a37a..98740f0 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -229,17 +229,14 @@ public:
\
inline ClassName##WeakRef( ) {} \
inline ClassName##WeakRef( ClassName* pObj ) {\
if( pObj ) _xHdl = pObj-GetHdl(); }\
-inline void Clear() { _xHdl.Clear(); } \
inline ClassName##WeakRef operator = ( ClassName * pObj ) {\
_xHdl = pObj ? pObj-GetHdl() : 0; return *this; } \
inline boolIs() const { \
return _xHdl.Is() _xHdl-GetObj(); } \
-inline ClassName * operator () const { \
-return (ClassName*) ( _xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
inline ClassName * operator - () const { \
return (ClassName*) ( _xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
-inline ClassName operator * () const { \
-return *(ClassName*) _xHdl-GetObj(); } \
+inline ClassName * operator () const { \
+return (ClassName*) ( _xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
inline operator ClassName * () const { \
return (ClassName*) (_xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/source
sc/source/ui/docshell/dbdocfun.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 44b270d2e05ab29d73366c5db3e31750614b7c6e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Sat Jul 12 21:46:13 2014 -0400 fdo#80462: Don't always increment the start row position. Sometimes someone might attempt to sort only a single row. Change-Id: Ie29d4cf7ec0bd3a5c945997083368b6ef6074268 (cherry picked from commit 5902dcf0995cdd0a6c1dbd1f9c21b0b2b3f5609f) Reviewed-on: https://gerrit.libreoffice.org/10260 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com (cherry picked from commit f97d25b66e88742e4cb4011cc4cc0bc682c1ee1c) Reviewed-on: https://gerrit.libreoffice.org/10278 Reviewed-by: David Tardon dtar...@redhat.com Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 1e7cbdb..d9d5550 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -493,7 +493,9 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam rSortParam, WaitObject aWait( rDocShell.GetActiveDialogParent() ); -SCROW nStartRow = aLocalParam.nRow1 + (aLocalParam.bHasHeader ? 1 : 0); +SCROW nStartRow = aLocalParam.nRow1; +if (aLocalParam.bByRow aLocalParam.bHasHeader nStartRow aLocalParam.nRow2) +++nStartRow; // Calculate the script types for all cells in the sort range beforehand. // This will speed up the row height adjustment that takes place after the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/AreaChart.cxx|2 +-
chart2/source/view/charttypes/BarChart.cxx | 12 ++--
chart2/source/view/charttypes/BubbleChart.cxx |2 +-
chart2/source/view/charttypes/CandleStickChart.cxx |8
chart2/source/view/charttypes/NetChart.cxx |2 +-
chart2/source/view/charttypes/PieChart.cxx |2 +-
chart2/source/view/charttypes/VSeriesPlotter.cxx | 15 +++
7 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit d96a5c6770bb7b13814e12de1cc30cc0163e8eb8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jul 22 10:16:21 2014 -0400
Remove this-. Pointless.
Change-Id: I6256c9087eec1f8b9745af6eef23fa59d697f835
diff --git a/chart2/source/view/charttypes/AreaChart.cxx
b/chart2/source/view/charttypes/AreaChart.cxx
index 8febf93..0501736 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -989,7 +989,7 @@ void AreaChart::createShapes()
.transformSceneToScreenPosition(
aScenePosition3D ) );
}
-this-createDataLabel( m_xTextTarget,
**aSeriesIter, nIndex
+createDataLabel( m_xTextTarget, **aSeriesIter,
nIndex
, fLogicValueForLabeDisplay
, rLogicYSumMap[nAttachedAxisIndex],
aScreenPosition2D, eAlignment, nOffset );
}
diff --git a/chart2/source/view/charttypes/BarChart.cxx
b/chart2/source/view/charttypes/BarChart.cxx
index 6e9aa3e..c75b1a6 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -843,10 +843,9 @@ void BarChart::createShapes()
}
}
-awt::Point aScreenPosition2D(
this-getLabelScreenPositionAndAlignment(
-eAlignment, nLabelPlacement
-, fLogicX, fLowerYValue, fUpperYValue, fLogicZ
-, fLowerBarDepth, fUpperBarDepth, fBaseValue,
pPosHelper ));
+awt::Point aScreenPosition2D =
getLabelScreenPositionAndAlignment(
+eAlignment, nLabelPlacement, fLogicX,
fLowerYValue, fUpperYValue, fLogicZ,
+fLowerBarDepth, fUpperBarDepth, fBaseValue,
pPosHelper);
sal_Int32 nOffset = 0;
if(LABEL_ALIGN_CENTER!=eAlignment)
{
@@ -854,8 +853,9 @@ void BarChart::createShapes()
if( m_nDimension == 3 )
nOffset = 260;
}
-this-createDataLabel( xTextTarget, **aSeriesIter,
nPointIndex
-, fLogicValueForLabeDisplay,
fLogicSum, aScreenPosition2D, eAlignment, nOffset );
+createDataLabel(
+xTextTarget, **aSeriesIter, nPointIndex,
+fLogicValueForLabeDisplay, fLogicSum,
aScreenPosition2D, eAlignment, nOffset);
}
}//end iteration through partial points
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx
b/chart2/source/view/charttypes/BubbleChart.cxx
index dc1204e..d79d382 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -385,7 +385,7 @@ void BubbleChart::createShapes()
sal_Int32 nOffset = 0;
if(LABEL_ALIGN_CENTER!=eAlignment)
nOffset = 100;//add some spacing //@todo maybe
get more intelligent values
-this-createDataLabel( xTextTarget, **aSeriesIter,
nIndex
+createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fBubbleSize, fBubbleSize,
aScreenPosition2D, eAlignment, nOffset );
}
}
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx
b/chart2/source/view/charttypes/CandleStickChart.cxx
index 3c62b26..50e3d2f 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -303,16 +303,16 @@ void CandleStickChart::createShapes()
if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) )
{
if(isValidPosition(aPosMiddleFirst))
-this-createDataLabel( xTextTarget, **aSeriesIter,
nIndex
+createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fUnscaledY_First, 1.0,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/xml/xmlexprt.cxx | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 7633ae819b0c29c2c108158d43d4d3f9c4622e7e
Author: Eike Rathke er...@redhat.com
Date: Mon Jul 21 18:50:31 2014 +0200
use SvXMLExport::GetRelativeReference(), fdo#79305
... instead of a manual approach that missed one extra package level.
Change-Id: I41c76eb84677fcf49eb09830127a419ed23ec643
(cherry picked from commit bc3b62e25eb0c3921fa600e80eeb314e45ecaaef)
Reviewed-on: https://gerrit.libreoffice.org/10444
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 9fb515a..7d00d39 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3090,18 +3090,8 @@ void writeContent(
{
// text:a xlink:href=url xlink:type=simplevalue/text:a
-Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
-bool bUseRelative =
officecfg::Office::Common::Save::URL::FileSystem::get( xContext );
OUString aURL = static_castconst
SvxURLField*(pField)-GetURL();
-if(bUseRelative)
-{
-OUString aBase = rExport.GetOrigFileName();
-INetURLObject aURLObject(aBase);
-aURLObject.removeSegment();
-aURLObject.removeSegment();
-aURL =
INetURLObject::GetRelURL(aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI),
aURL);
-}
-rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aURL);
+rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,
rExport.GetRelativeReference(aURL));
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, simple);
OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basctl/source
basctl/source/basicide/localizationmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e712c229f02e62641856ef5dddbf3c6a38dbf5af
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jul 21 19:26:58 2014 +0200
Resolves fdo#80906: Delete any control on Dialog editing window crashes LO
Quick fix for this bt:
3 0x2b2935d2 in __GI___assert_fail (assertion=0x2aaae1f2806a
_pInterface != 0,
file=0x2aaae1f28018
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h,
line=402,
function=0x2aaae1f28480
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager::operator-()
const::__PRETTY_FUNCTION__ interface_type* com::sun::star::uno::Reference
template-parameter-1-1 ::operator-() const [with interface_type =
com::sun::star::resource::XStringResourceManager]) at assert.c:101
4 0x2aaae1e2963b in
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager::operator-
(this=0x7fff2d00)
at
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h:402
5 0x2aaae1eb5c87 in
basctl::LocalizationMgr::implHandleControlResourceProperties (aControlAny=
uno::Any {com::sun::star::uno::XInterface = {_vptr.XInterface =
0x8935ea8}, No data fields}, aDialogName=Dialog1, aCtrlName=TextField1,
xStringResourceManager=empty uno::Reference,
xSourceStringResolver=empty uno::Reference,
eMode=basctl::LocalizationMgr::REMOVE_IDS_FROM_RESOURCE)
at
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:202
6 0x2aaae1eb92a0 in
basctl::LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject
(pEditor=0x919d820, aControlAny=
uno::Any {com::sun::star::uno::XInterface = {_vptr.XInterface =
0x8935ea8}, No data fields}, aCtrlName=TextField1)
at
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:896
Indeed, LocalizationMgr::setControlResourceIDsForNewEditorObject just
returns if !xStringResourceManager.is()
So let's do the same when trying to delete ControlResources
See
http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/localizationmgr.cxx#835
Cherry-picked from e1840cf944b36b7ead5800a036870e38f4ddb049
Change-Id: I4be49503cd2464f97a25840dfdc29877e5fb2b93
Reviewed-on: https://gerrit.libreoffice.org/10448
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basctl/source/basicide/localizationmgr.cxx
b/basctl/source/basicide/localizationmgr.cxx
index c34ac55..53e268b 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -199,7 +199,7 @@ sal_Int32
LocalizationMgr::implHandleControlResourceProperties
Reference XPropertySet xPropertySet;
aControlAny = xPropertySet;
-if( xPropertySet.is() )
+if( xPropertySet.is() xStringResourceManager.is())
{
Sequence Locale aLocaleSeq = xStringResourceManager-getLocales();
sal_Int32 nLocaleCount = aLocaleSeq.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/xml/xmlexprt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 23e54b541892c0343e012b51c5722f8e3edc02ef Author: Eike Rathke er...@redhat.com Date: Mon Jul 21 19:10:12 2014 +0200 use SvXMLExport::GetRelativeReference(), fdo#79305 Change-Id: I1e92a87034cf31470a9d8809f3b543b154c65126 Reviewed-on: https://gerrit.libreoffice.org/10445 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 058e719..2e73236 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3080,7 +3080,7 @@ void writeContent( // text:a xlink:href=url xlink:type=simplevalue/text:a OUString aURL = static_castconst SvxURLField*(pField)-GetURL(); -rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aURL); +rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(aURL)); rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, simple); OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basctl/source
basctl/source/basicide/localizationmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f712e0376cf77386b788093e9d19cfd0ea29913
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jul 21 19:26:58 2014 +0200
Resolves fdo#80906: Delete any control on Dialog editing window crashes LO
Quick fix for this bt:
3 0x2b2935d2 in __GI___assert_fail (assertion=0x2aaae1f2806a
_pInterface != 0,
file=0x2aaae1f28018
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h,
line=402,
function=0x2aaae1f28480
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager::operator-()
const::__PRETTY_FUNCTION__ interface_type* com::sun::star::uno::Reference
template-parameter-1-1 ::operator-() const [with interface_type =
com::sun::star::resource::XStringResourceManager]) at assert.c:101
4 0x2aaae1e2963b in
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager::operator-
(this=0x7fff2d00)
at
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h:402
5 0x2aaae1eb5c87 in
basctl::LocalizationMgr::implHandleControlResourceProperties (aControlAny=
uno::Any {com::sun::star::uno::XInterface = {_vptr.XInterface =
0x8935ea8}, No data fields}, aDialogName=Dialog1, aCtrlName=TextField1,
xStringResourceManager=empty uno::Reference,
xSourceStringResolver=empty uno::Reference,
eMode=basctl::LocalizationMgr::REMOVE_IDS_FROM_RESOURCE)
at
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:202
6 0x2aaae1eb92a0 in
basctl::LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject
(pEditor=0x919d820, aControlAny=
uno::Any {com::sun::star::uno::XInterface = {_vptr.XInterface =
0x8935ea8}, No data fields}, aCtrlName=TextField1)
at
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:896
Indeed, LocalizationMgr::setControlResourceIDsForNewEditorObject just
returns if !xStringResourceManager.is()
So let's do the same when trying to delete ControlResources
See
http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/localizationmgr.cxx#835
Cherry-picked from e1840cf944b36b7ead5800a036870e38f4ddb049
Change-Id: I4be49503cd2464f97a25840dfdc29877e5fb2b93
Reviewed-on: https://gerrit.libreoffice.org/10449
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basctl/source/basicide/localizationmgr.cxx
b/basctl/source/basicide/localizationmgr.cxx
index 2812387..9d0cc87 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -199,7 +199,7 @@ sal_Int32
LocalizationMgr::implHandleControlResourceProperties
Reference XPropertySet xPropertySet;
aControlAny = xPropertySet;
-if( xPropertySet.is() )
+if( xPropertySet.is() xStringResourceManager.is())
{
Sequence Locale aLocaleSeq = xStringResourceManager-getLocales();
sal_Int32 nLocaleCount = aLocaleSeq.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/items/poolio.cxx | 329 +++-
1 file changed, 144 insertions(+), 185 deletions(-)
New commits:
commit 5ad0673063d92faeab28db1048513b6f1e71b94f
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Tue Jul 22 12:05:48 2014 +0200
fdo#39468 Finish translating German comments
Change-Id: I8163bd42c24a4f5a5fd4e048836d7e77d3993fe2
Reviewed-on: https://gerrit.libreoffice.org/10452
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 374a8f1..bbc73f5 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -451,10 +451,9 @@ SvStream SfxItemPool::Load(SvStream rStream)
std::vectorSfxPoolItemArray_Impl*::iterator itrItemArr =
pImp-maPoolItems.begin();
for( size_t nArrCnt = GetSize_Impl(); nArrCnt; --nArrCnt, ++itrItemArr
)
{
-// ist uberhaupt ein Item mit dem Which-Wert da?
+// Is there an Item with that Which value present at all?
if ( *itrItemArr )
{
-// Is there an item with the Which value present at all?
SfxPoolItemArrayBase_Impl::iterator ppHtArr =
(*itrItemArr)-begin();
for( size_t n = (*itrItemArr)-size(); n; --n, ++ppHtArr )
if (*ppHtArr)
@@ -997,10 +996,10 @@ SvStream SfxItemPool::Load1_Impl(SvStream rStream)
*/
const SfxPoolItem* SfxItemPool::LoadSurrogate
(
-SvStream rStream,// vor einem Surrogat positionierter Stream
-sal_uInt16 rWhich, // Which-Id des zu ladenden
SfxPoolItems
-sal_uInt16 nSlotId,// Slot-Id des zu ladenden
SfxPoolItems
-const SfxItemPool* pRefPool// SfxItemPool in dem das Surrogat gilt
+SvStream rStream,// Stream before a surrogate
+sal_uInt16 rWhich, // WhichId of the SfxPoolItem that is to
be loaded
+sal_uInt16 nSlotId,// SlotId of the SfxPoolItem that is to be
loaded
+const SfxItemPool* pRefPool// SfxItemPool in which the surrogate is
valid
)
{
// Read the first surrogate
@@ -1018,34 +1017,35 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
return 0;
}
-// Bei einem identisch aufgebauten Pool (im Stream) kann das Surrogat
-// auf jeden Fall aufgelost werden.
+// If the Pool in the stream has the same structure, the surrogate
+// can be resolved in any case
if ( !pRefPool )
pRefPool = this;
+
bool bResolvable = !pRefPool-GetName().isEmpty();
if ( !bResolvable )
{
-// Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId
-// aus dem Stream in eine Which-Id gemappt werden konnen.
+// If the pool in the stream has a different structure, the SlotId
+// from the stream must be mapable to a WhichId
sal_uInt16 nMappedWhich = nSlotId ? GetWhich(nSlotId, true) : 0;
if ( IsWhich(nMappedWhich) )
{
-// gemappte SlotId kann ubernommen werden
+// Mapped SlotId can be taken over
rWhich = nMappedWhich;
bResolvable = true;
}
}
-// kann Surrogat aufgelost werden?
+// Can the surrogate be resolved?
if ( bResolvable )
{
const SfxPoolItem *pItem = 0;
for ( SfxItemPool *pTarget = this; pTarget; pTarget =
pTarget-pImp-mpSecondary )
{
-// richtigen (Folge-) Pool gefunden?
+// Found the right (Range-)Pool?
if ( pTarget-IsInRange(rWhich) )
{
-// default attribute?
+// Default attribute?
if ( SFX_ITEMS_DEFAULT == nSurrogat )
return *(pTarget-pImp-ppStaticDefaults +
pTarget-GetIndex_Impl(rWhich));
@@ -1058,15 +1058,15 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
if ( !pItem )
{
OSL_FAIL( can't resolve surrogate );
-rWhich = 0; // nur zur Sicherheit fuer richtige Stream-Pos
+rWhich = 0; // Just to be sure; for the right StreamPos
return 0;
}
-// Nachladen aus Ref-Pool?
+// Reload from RefPool?
if ( pRefPool != pImp-mpMaster )
return pTarget-Put( *pItem );
-// Referenzen sind NICHT schon mit Pool geladen worden?
+// References have NOT been loaded together with the pool?
if ( !pTarget-HasPersistentRefCounts() )
AddRef( *pItem, 1 );
else
@@ -1124,7 +1124,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem
*pItem) const
SFX_ASSERT( false, pItem-Which(), unknown Which-Id - dont ask me for
surrogates );
}
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #121 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Philipp Weissenbacher committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=5ad0673063d92faeab28db1048513b6f1e71b94f fdo#39468 Finish translating German comments The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - ucb/source
ucb/source/ucp/cmis/cmis_content.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit dd3772343e933175f9aeddfa566024850772d2aa
Author: Mihai Varga mihai.m...@gmail.com
Date: Tue Jul 22 18:34:40 2014 +0300
OneDrive authFallback added in cmis_content
Change-Id: I19e185defdaf5f2e421f547ce9e900b97b83268e
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index de6d5c0..5775715 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -297,6 +297,7 @@ namespace cmis
// Get the auth credentials
AuthProvider authProvider( xEnv,
m_xIdentifier-getContentIdentifier( ), m_aURL.getBindingUrl( ) );
+AuthProvider::setXEnv( xEnv );
string rUsername = OUSTR_TO_STDSTR( m_aURL.getUsername( ) );
string rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) );
@@ -315,10 +316,13 @@ namespace cmis
ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET
) );
if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
+{
+libcmis::SessionFactory::setOAuth2AuthCodeProvider(
authProvider.onedriveAuthCodeFallback );
oauth2Data.reset( new libcmis::OAuth2Data(
ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
ONEDRIVE_CLIENT_ID, ONEDRIVE_CLIENT_SECRET ) );
+}
m_pSession = libcmis::SessionFactory::createSession(
OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgstyleattributes.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2662df924f7d5e2d65ec727be99e39c18e1e3e7b
Author: Joren De Cuyper jore...@libreoffice.org
Date: Tue Jul 22 17:33:03 2014 +0200
Fix build: incorrect revertion svgio
Incorrect revertion in commit 3d3401a6397e893808309ec374f5d8f890144906
Change-Id: If4abac2670b083ebbc75c2fe06ae9e100072ef00
Reviewed-on: https://gerrit.libreoffice.org/10466
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index 9c24753..cece396 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -208,7 +208,7 @@ namespace svgio
return getCssStyleParent();
}
-if(mrOwner.getParent())
+if(mrOwner.supportsParentStyle() mrOwner.getParent())
{
return mrOwner.getParent()-getSvgStyleAttributes();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sw/source
sw/source/core/layout/paintfrm.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 136cfba30fc49f66f1f365d13ee0e717c4cd8f53
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jul 22 14:01:40 2014 +0200
fdo#79221: Wrong rendering of bottom and right character border
Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0.
SetMirrorWidths() works only when there are two lines
(double border), but breaks one line borders.
Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9
(cherry picked from commit bdbf6cee5a3a012412699dba103b9f6430084722)
Reviewed-on: https://gerrit.libreoffice.org/10460
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Joren De Cuyper jore...@libreoffice.org
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 3e4ed87..3098638 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5080,7 +5080,8 @@ void PaintCharacterBorder(
if( aBottomBorder )
{
-aBottomBorder-SetMirrorWidths(true);
+if( aBottomBorder-isDouble() )
+aBottomBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Left(),
@@ -5118,7 +5119,8 @@ void PaintCharacterBorder(
if( aRightBorder )
{
-aRightBorder-SetMirrorWidths(true);
+if( aRightBorder-isDouble() )
+aRightBorder-SetMirrorWidths(true);
Point aLeftTop(
aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libxml2
external/libxml2/ExternalProject_xml2.mk |2 +- external/libxml2/libxml2-icu.patch.0 |6 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 32aa2a2a945c66951627bd5e0fc568ab9adbfc81 Author: David Tardon dtar...@redhat.com Date: Mon Jul 21 15:32:37 2014 +0200 fix debug build of libxml2 on windows (cherry picked from commit a8a3ad1e5f2c2539aae8067a3506a896b83389de) Test $(DEBUG) for being non-empty instead of 1 (which it is not) (cherry picked from commit 22274468ef27ae8651f8ea8805611bf39758b9d5) fix debug build of libxml2 on windows, version 2 (cherry picked from commit 6831ae4d0e0b69e4f06c2987c3be748c8f35c9d8) Change-Id: I22e7a142bb874653344a7ffcc55e8a062669fa2a Reviewed-on: https://gerrit.libreoffice.org/10442 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index cb23686..f19cb52 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_use_external_project,xml2,icu) $(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ - iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ unset MAKEFLAGS \ LIB=$(ILIB) nmake \ ,win32) diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index 6a9f8e4..4db9f9b 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -17,12 +17,16 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) LIBS = !if $(WITH_FTP) == 1 || $(WITH_HTTP) == 1 -@@ -78,7 +78,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib +@@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib LIBS = $(LIBS) iconv.lib !endif !if $(WITH_ICU) == 1 -LIBS = $(LIBS) icu.lib ++!if $(WITH_RUN_DEBUG) == 1 ++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib ++!else +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib ++!endif !endif !if $(WITH_ZLIB) == 1 # could be named differently zdll or zlib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source sw/source
svtools/source/misc/embedtransfer.cxx |5 +
sw/source/uibase/dochdl/swdtflvr.cxx | 18 ++
2 files changed, 23 insertions(+)
New commits:
commit 6296c64fb0ed8bce61eb6303920f952eda65de71
Author: Muthu Subramanian muthu.subramanian.karunani...@ericsson.com
Date: Tue Jul 22 22:08:16 2014 +0530
Enable copy-paste of charts/ole as bitmaps.
Adds FORMAT_BITMAP to OLE Objects - to allow charts
to be pasted into non-LibreOffice applications.
Should be safe for all OLE Objects, though.
Change-Id: If18768b82d4bb4415b3a8e00828b2eb5c31eeb15
diff --git a/svtools/source/misc/embedtransfer.cxx
b/svtools/source/misc/embedtransfer.cxx
index 7792f84..7c99085 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -76,6 +76,7 @@ void SvEmbedTransferHelper::AddSupportedFormats()
AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
AddFormat( FORMAT_GDIMETAFILE );
+AddFormat( FORMAT_BITMAP );
}
@@ -169,6 +170,10 @@ bool SvEmbedTransferHelper::GetData( const
css::datatransfer::DataFlavor rFlavo
SetAny( aAny, rFlavor );
bRet = true;
}
+else if ( ( nFormat == FORMAT_BITMAP || nFormat ==
SOT_FORMATSTR_ID_PNG ) m_pGraphic )
+{
+bRet = SetBitmapEx( m_pGraphic-GetBitmapEx(), rFlavor );
+}
else if ( m_xObj.is() ::
svt::EmbeddedObjectRef::TryRunningState( m_xObj ) )
{
uno::Reference datatransfer::XTransferable
xTransferable( m_xObj-getComponent(), uno::UNO_QUERY );
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 9d33a70..57fb9c7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -499,6 +499,7 @@ bool SwTransferable::GetData( const DataFlavor rFlavor,
const OUString rDestDo
// the following solution will be used in the case when the object can
not generate the image
// TODO/LATER: in future the transferhelper must probably be created
based on object and the replacement stream
+// TODO: Block not required now, SvEmbedTransferHelper should be able
to handle GDIMetaFile format
if ( nFormat == SOT_FORMAT_GDIMETAFILE )
{
pOLEGraph = FindOLEReplacementGraphic();
@@ -832,6 +833,23 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
AddFormat( FORMAT_GDIMETAFILE );
+
+// Fetch the formats supported via embedtransferhelper as well
+sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
+uno::Reference embed::XEmbeddedObject xObj = FindOLEObj( nAspect );
+const Graphic* pOLEGraph = FindOLEReplacementGraphic();
+if( xObj.is() )
+{
+TransferableDataHelper aD( new SvEmbedTransferHelper( xObj,
pOLEGraph, nAspect ) );
+if ( aD.GetTransferable().is() )
+{
+DataFlavorExVector aVector(
aD.GetDataFlavorExVector() );
+DataFlavorExVector::iteratoraIter( aVector.begin() ),
aEnd( aVector.end() );
+
+while( aIter != aEnd )
+AddFormat( *aIter++ );
+}
+}
eBufferType = TRNSFR_OLE;
}
// Is there anything to provide anyway?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/registry connectivity/source dbaccess/source reportbuilder/java
connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu |2
+-
connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu |2
+-
connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu |2
+-
connectivity/source/commontools/dbmetadata.cxx |2
+-
connectivity/source/drivers/jdbc/JDriver.cxx|2
+-
connectivity/source/drivers/odbc/ODriver.cxx|2
+-
dbaccess/source/core/dataaccess/ModelImpl.cxx |2
+-
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java|4
++--
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 568778874429595855b435792e5ebecd52956dae
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jul 22 18:36:05 2014 +0200
Resolves fdo#81213: Wrong table-clause generated by reportbuilder
Oracle doesn't accept AS for making an alias from a table
See https://bugs.freedesktop.org/show_bug.cgi?id=81213#c2
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c4
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c5
for more information
(thank you Lionel)
Change-Id: I33c86d78b2590116d4af46ffd3e54c3c791268ea
diff --git
a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 34e85f4..210a9b7 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -50,7 +50,7 @@
/node
node oor:name=UseKeywordAsBeforeAlias oor:op=replace
prop oor:name=Value oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
/node
node oor:name=UseBracketedOuterJoinSyntax oor:op=replace
diff --git
a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index f462444..dc8b317 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -75,7 +75,7 @@
/node
node oor:name=UseKeywordAsBeforeAlias oor:op=replace
prop oor:name=Value oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
/node
node oor:name=UseBracketedOuterJoinSyntax oor:op=replace
diff --git
a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index e660674..8711eda 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -80,7 +80,7 @@
/node
node oor:name=UseKeywordAsBeforeAlias oor:op=replace
prop oor:name=Value oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
/node
node oor:name=UseBracketedOuterJoinSyntax oor:op=replace
diff --git a/connectivity/source/commontools/dbmetadata.cxx
b/connectivity/source/commontools/dbmetadata.cxx
index bb1b23df..24cdbdb 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -291,7 +291,7 @@ namespace dbtools
bool DatabaseMetaData::generateASBeforeCorrelationName() const
{
-bool doGenerate( true );
+bool doGenerate( false );
Any setting;
if ( lcl_getConnectionSetting( GenerateASBeforeCorrelationName,
*m_pImpl, setting ) )
OSL_VERIFY( setting = doGenerate );
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx
b/connectivity/source/drivers/jdbc/JDriver.cxx
index 4833548..d4b1fe3 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -192,7 +192,7 @@ Sequence DriverPropertyInfo SAL_CALL
java_sql_Driver::getPropertyInfo( const
OUString(GenerateASBeforeCorrelationName)
,OUString(Generate AS before table correlation names.)
,sal_False
-,OUString( true )
+,OUString( false )
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx
b/connectivity/source/drivers/odbc/ODriver.cxx
index 1b95826..3d064f0 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -178,7 +178,7 @@ Sequence DriverPropertyInfo SAL_CALL
ODBCDriver::getPropertyInfo( const OUStr
OUString(GenerateASBeforeCorrelationName)
,OUString(Generate AS before table correlation names.)
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/doc/guisaveas.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a958b590a34a1eaa888a36285f6aa364606383ad
Author: David Tardon dtar...@redhat.com
Date: Mon Jul 14 15:07:52 2014 +0200
fdo#81304 don't parse file name as part of URL
... because the name is not URL-encoded at this point, so parsing it as
a part of the URL will interpret special characters, e.g. #.
Change-Id: I780baed1753e9674d835dc296d31c088b67d8ba7
(cherry picked from commit f3d7734af45f30a87d6de76aa3de7593d541bdc8)
Reviewed-on: https://gerrit.libreoffice.org/10295
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 446d9d5..13105dc 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1279,7 +1279,8 @@ OUString ModelData_Impl::GetRecommendedName( const
OUString aSuggestedName, con
uno::UNO_QUERY );
if ( xTypeDetection.is() )
{
-INetURLObject aObj( OUString( file:///c:/ ) +
aRecommendedName );
+INetURLObject aObj( OUString( file:///c:/ ) );
+aObj.SetName( aRecommendedName );
uno::Sequence beans::PropertyValue aTypeNameProps;
if ( ( xTypeDetection-getByName( aTypeName ) =
aTypeNameProps ) aTypeNameProps.getLength() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source
sfx2/source/doc/guisaveas.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 40eddf707f8f56fa63ddba9f4713a32dba43bd62
Author: David Tardon dtar...@redhat.com
Date: Mon Jul 14 15:07:52 2014 +0200
fdo#81304 don't parse file name as part of URL
... because the name is not URL-encoded at this point, so parsing it as
a part of the URL will interpret special characters, e.g. #.
Change-Id: I780baed1753e9674d835dc296d31c088b67d8ba7
(cherry picked from commit f3d7734af45f30a87d6de76aa3de7593d541bdc8)
Reviewed-on: https://gerrit.libreoffice.org/10294
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 85a9947..b8d487d 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1279,7 +1279,8 @@ OUString ModelData_Impl::GetRecommendedName( const
OUString aSuggestedName, con
uno::UNO_QUERY );
if ( xTypeDetection.is() )
{
-INetURLObject aObj( OUString( file:///c:/ ) +
aRecommendedName );
+INetURLObject aObj( OUString( file:///c:/ ) );
+aObj.SetName( aRecommendedName );
uno::Sequence beans::PropertyValue aTypeNameProps;
if ( ( xTypeDetection-getByName( aTypeName ) =
aTypeNameProps ) aTypeNameProps.getLength() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 18 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 28 ++-
sw/source/filter/ww8/wrtww8gr.cxx|2 -
3 files changed, 37 insertions(+), 11 deletions(-)
New commits:
commit 41fde63b3ec4da0a4a6636105dd7b65fdfc7ad44
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 11:36:32 2014 +0100
Resolves: fdo#52226 swap in graphics on .docx and .rtf export
Change-Id: Ie818b382c0b17760c720ff2f2c73a3697989f97e
(cherry picked from commit 9dd5caac62083f7162d83319284df68ee83e3777)
Reviewed-on: https://gerrit.libreoffice.org/10281
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 98ed78b..a77b8fa 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3637,7 +3637,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
// inline, we also have to write the image itself
const Graphic* pGraphic = 0;
if (pGrfNode)
-pGraphic = const_cast Graphic ( pGrfNode-GetGrf() );
+pGraphic = pGrfNode-GetGrf();
else
pGraphic = pOLENode-GetGraphic();
@@ -3648,8 +3648,24 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
{
// Not in cache, then need to write it.
m_rDrawingML.SetFS( m_pSerializer ); // to be sure that we write
to the right stream
+
+bool bSwapped = pGraphic-IsSwapOut();
+if (bSwapped)
+{
+if (pGrfNode)
+{
+// always swapin via the Node
+const_castSwGrfNode*(pGrfNode)-SwapIn();
+}
+else
+const_castGraphic*(pGraphic)-SwapIn();
+}
+
OUString aImageId = m_rDrawingML.WriteImage( *pGraphic );
+if (bSwapped)
+const_castGraphic*(pGraphic)-SwapOut();
+
aRelId = OUStringToOString( aImageId, RTL_TEXTENCODING_UTF8 );
m_aRelIdCache[pGraphic] = aRelId;
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index b9ab17b..9f14309 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3586,17 +3586,24 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
const sal_uInt8* pGraphicAry = 0;
sal_uInt32 nSize = 0;
-Graphic aGraphic(pGrfNode-GetGrf());
+const Graphic rGraphic(pGrfNode-GetGrf());
// If there is no graphic there is not much point in parsing it
-if (aGraphic.GetType()==GRAPHIC_NONE)
+if (rGraphic.GetType()==GRAPHIC_NONE)
return;
+bool bSwapped = rGraphic.IsSwapOut();
+if (bSwapped)
+{
+// always swapin via the Node
+const_castSwGrfNode*(pGrfNode)-SwapIn();
+}
+
GfxLink aGraphicLink;
const sal_Char* pBLIPType = 0;
-if (aGraphic.IsLink())
+if (rGraphic.IsLink())
{
-aGraphicLink = aGraphic.GetLink();
+aGraphicLink = rGraphic.GetLink();
nSize = aGraphicLink.GetDataSize();
pGraphicAry = aGraphicLink.GetData();
switch (aGraphicLink.GetType())
@@ -3629,10 +3636,10 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
}
}
-GraphicType eGraphicType = aGraphic.GetType();
+GraphicType eGraphicType = rGraphic.GetType();
if (!pGraphicAry)
{
-if (ERRCODE_NONE == GraphicConverter::Export(aStream, aGraphic,
+if (ERRCODE_NONE == GraphicConverter::Export(aStream, rGraphic,
(eGraphicType == GRAPHIC_BITMAP) ? CVT_PNG : CVT_WMF))
{
pBLIPType = (eGraphicType == GRAPHIC_BITMAP) ?
@@ -3643,7 +3650,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
}
}
-Size aMapped(eGraphicType == GRAPHIC_BITMAP ? aGraphic.GetSizePixel() :
aGraphic.GetPrefSize());
+Size aMapped(eGraphicType == GRAPHIC_BITMAP ? rGraphic.GetSizePixel() :
rGraphic.GetPrefSize());
const SwCropGrf rCr = (const
SwCropGrf)pGrfNode-GetAttr(RES_GRFATR_CROPGRF);
@@ -3672,7 +3679,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
else
{
aStream.Seek(0);
-GraphicConverter::Export(aStream, aGraphic, CVT_WMF);
+GraphicConverter::Export(aStream, rGraphic, CVT_WMF);
pBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE;
aStream.Seek(STREAM_SEEK_TO_END);
nSize = aStream.Tell();
@@ -3686,7 +3693,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/guisaveas.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 196abcf8f42891a05ec639a7570e5092bafe1b48
Author: Eike Rathke er...@redhat.com
Date: Tue Jul 22 20:02:36 2014 +0200
do not unescape sequence in original name in GetRecommendedName()
Noted with the fix for fdo#81304 the code unescaped an escaped sequence
in the original file name, for example foo%20bar became foo bar.
This change preserves such sequences, though the final result at the
(GTK) file picker is still unescaped, which happens somewhere else.
However, now for the suggested file name foo%20bar#baz an InetURLObj
of foo%2520bar%23baz is created and results in a recommended name of
foo%20bar#baz again.
Change-Id: I620811e33bdb74323ddcb3d732428179bf7181d4
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 2294772..cf18115 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1279,8 +1279,8 @@ OUString ModelData_Impl::GetRecommendedName( const
OUString aSuggestedName, con
uno::UNO_QUERY );
if ( xTypeDetection.is() )
{
-INetURLObject aObj( OUString( file:///c:/ ) );
-aObj.SetName( aRecommendedName );
+INetURLObject aObj( OUString( c:/ ) + aRecommendedName,
INET_PROT_FILE,
+INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_UTF8,
INetURLObject::FSYS_DOS );
uno::Sequence beans::PropertyValue aTypeNameProps;
if ( ( xTypeDetection-getByName( aTypeName ) =
aTypeNameProps ) aTypeNameProps.getLength() )
@@ -1293,7 +1293,7 @@ OUString ModelData_Impl::GetRecommendedName( const
OUString aSuggestedName, con
aObj.SetExtension( aExtensions[0] );
}
-aRecommendedName = aObj.GetName(
INetURLObject::DECODE_WITH_CHARSET );
+aRecommendedName = aObj.GetName(
INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/hunspell lingucomponent/source
external/hunspell/hunspell-fdo48017-wfopen.patch |9 +++--
lingucomponent/source/lingutil/lingutil.cxx |8
lingucomponent/source/lingutil/lingutil.hxx |5 +
lingucomponent/source/spellcheck/spell/sspellimp.cxx |4 ++--
4 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 723198a9f7b7483c9366b06cedc8cfa6079efe25
Author: László Németh nem...@numbertext.org
Date: Tue Jul 22 19:26:31 2014 +0200
fdo#80363 backport of the fix for Cyrillic spell. dictionary path
(LibreOffice 4.2.5 has problem only with the spelling dictionary path,
this bug doesn't affect hyphenation dictionaries and thesauri here).
Change-Id: I85f423a647f0f1765440287fbe4e9add9d740d83
Reviewed-on: https://gerrit.libreoffice.org/10471
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/external/hunspell/hunspell-fdo48017-wfopen.patch
b/external/hunspell/hunspell-fdo48017-wfopen.patch
index 47b803b..37203be 100644
--- a/external/hunspell/hunspell-fdo48017-wfopen.patch
+++ b/external/hunspell/hunspell-fdo48017-wfopen.patch
@@ -13,7 +13,7 @@ diff -ru hunspell/src/hunspell/csutil.cxx
build/hunspell/src/hunspell/csutil.cxx
#ifdef OPENOFFICEORG
# include unicode/uchar.h
#else
-@@ -46,6 +50,21 @@
+@@ -51,6 +51,26 @@
static struct unicode_info2 * utf_tbl = NULL;
static int utf_tbl_count = 0; // utf_tbl can be used by multiple Hunspell
instances
@@ -23,9 +23,14 @@ diff -ru hunspell/src/hunspell/csutil.cxx
build/hunspell/src/hunspell/csutil.cxx
+if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f = NULL;
+MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++if (_wfullpath( buff2, buff, len ) != NULL) {
++ f = _wfopen(buff2, (strcmp(mode, r) == 0) ? Lr : Lrb);
++}
+free(buff);
++free(buff2);
+return f;
+}
+#endif
diff --git a/lingucomponent/source/lingutil/lingutil.cxx
b/lingucomponent/source/lingutil/lingutil.cxx
index c0ef851..ab2244b 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -48,6 +48,14 @@ using ::com::sun::star::lang::Locale;
using namespace ::com::sun::star;
#if defined(WNT)
+
+OString Win_AddLongPathPrefix( const OString rPathName )
+{
+#define WIN32_LONG_PATH_PREFIX ?\\
+ if (!rPathName.match(WIN32_LONG_PATH_PREFIX)) return WIN32_LONG_PATH_PREFIX
+ rPathName;
+ return rPathName;
+}
+
OString Win_GetShortPathName( const OUString rLongPathName )
{
OString aRes;
diff --git a/lingucomponent/source/lingutil/lingutil.hxx
b/lingucomponent/source/lingutil/lingutil.hxx
index f5f1d76..5319661 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -54,6 +54,11 @@ inline sal_Bool operator == ( const
::com::sun::star::lang::Locale rL1, const :
}
#if defined(WNT)
+
+// to be use to get a path name with long path prefix
+// under Windows for Hunspell
+OString Win_AddLongPathPrefix( const OString rPathName );
+
///
// to be use to get a short path name under Windows that still can be used with
// the 'fopen' call. This is necessary since under Windows there seems to be
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 1809efe..cf3d26f 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -315,8 +315,8 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString
rWord, const Locale rL
// about 120+ characters which will usually be exceed when
// using dictionaries as extensions. (Hunspell waits UTF-8
encoded
// path with \\?\ long path prefix.)
-OString aTmpaff = OUStringToOString(aff,
RTL_TEXTENCODING_UTF8);
-OString aTmpdict = OUStringToOString(dict,
RTL_TEXTENCODING_UTF8);
+OString aTmpaff =
Win_AddLongPathPrefix(OUStringToOString(aff, RTL_TEXTENCODING_UTF8));
+OString aTmpdict =
Win_AddLongPathPrefix(OUStringToOString(dict, RTL_TEXTENCODING_UTF8));
#else
OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding()));
OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdoc.cxx |2 +- editeng/source/editeng/editeng.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 0f47de0cff673d298af63926e15e3dff40ee80db Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Jul 22 15:25:27 2014 -0400 Fix the font handling esp wrt font colors. Change-Id: I7dda03368f67ea6a12dfb39115f4546277abb76b diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 97073c0..5865567 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1908,7 +1908,7 @@ void CreateFont( SvxFont rFont, const SfxItemSet rSet, bool bSearchInParent, s if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_COLOR ) == SFX_ITEM_ON ) ) rFont.SetColor( ((const SvxColorItem)rSet.Get( EE_CHAR_COLOR )).GetValue() ); if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_BKGCOLOR ) == SFX_ITEM_ON ) ) -rFont.SetColor( ((const SvxBackgroundColorItem)rSet.Get( EE_CHAR_BKGCOLOR )).GetValue() ); +rFont.SetFillColor( ((const SvxBackgroundColorItem)rSet.Get( EE_CHAR_BKGCOLOR )).GetValue() ); if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontHeight ) == SFX_ITEM_ON ) ) rFont.SetSize( Size( rFont.GetSize().Width(), ((const SvxFontHeightItem)rSet.Get( nWhich_FontHeight ) ).GetHeight() ) ); if ( bSearchInParent || ( rSet.GetItemState( nWhich_Weight ) == SFX_ITEM_ON ) ) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 86ebf83..ed9f9ff 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2600,7 +2600,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet rSet, const SvxFont rFont ) rSet.Put( SvxEscapementItem( rFont.GetEscapement(), rFont.GetPropr(), EE_CHAR_ESCAPEMENT ) ); rSet.Put( SvxWeightItem( rFont.GetWeight(), EE_CHAR_WEIGHT ) ); rSet.Put( SvxColorItem( rFont.GetColor(), EE_CHAR_COLOR ) ); -rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_COLOR ) ); +rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_BKGCOLOR ) ); rSet.Put( SvxUnderlineItem( rFont.GetUnderline(), EE_CHAR_UNDERLINE ) ); rSet.Put( SvxOverlineItem( rFont.GetOverline(), EE_CHAR_OVERLINE ) ); rSet.Put( SvxCrossedOutItem( rFont.GetStrikeout(), EE_CHAR_STRIKEOUT ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 mchan...@shaw.ca changed: What|Removed |Added Depends on||76565 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/inc/VDataSeries.hxx | 99 +---
chart2/source/view/main/VDataSeries.cxx | 41 +
2 files changed, 83 insertions(+), 57 deletions(-)
New commits:
commit 94b82e43c045d7df393c7843890f70452c0c7bdd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jul 22 17:09:12 2014 -0400
com::sun::star - css.
And make some methods non-inline, to unclutter the header.
Change-Id: I748a4cf8f8d5acef8f7583f8faf6834a3bec536c
diff --git a/chart2/source/view/inc/VDataSeries.hxx
b/chart2/source/view/inc/VDataSeries.hxx
index c62b45d..1cc5ee4 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -44,39 +44,33 @@ namespace chart
class VDataSequence
{
public:
-void init( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::data::XDataSequence xModel );
+void init( const css::uno::Referencecss::chart2::data::XDataSequence
xModel );
bool is() const;
void clear();
double getValue( sal_Int32 index ) const;
sal_Int32 detectNumberFormatKey( sal_Int32 index ) const;
sal_Int32 getLength() const;
-::com::sun::star::uno::Reference
-::com::sun::star::chart2::data::XDataSequence Model;
+css::uno::Referencecss::chart2::data::XDataSequence Model;
-mutable ::com::sun::star::uno::Sequence double Doubles;
+mutable css::uno::Sequencedouble Doubles;
};
class VDataSeries SAL_FINAL : boost::noncopyable
{
public:
-VDataSeries( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::XDataSeries xDataSeries );
+VDataSeries( const css::uno::Referencecss::chart2::XDataSeries
xDataSeries );
~VDataSeries();
-::com::sun::star::uno::Reference ::com::sun::star::chart2::XDataSeries
-getModel() const { return m_xDataSeries;}
+css::uno::Referencecss::chart2::XDataSeries getModel() const;
void setCategoryXAxis();
-void setXValues( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::data::XDataSequence xValues );
-void setXValuesIfNone( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::data::XDataSequence xValues );
+void setXValues( const
css::uno::Referencecss::chart2::data::XDataSequence xValues );
+void setXValuesIfNone( const
css::uno::Referencecss::chart2::data::XDataSequence xValues );
void setParticle( const OUString rSeriesParticle );
void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
-void setPageReferenceSize( const ::com::sun::star::awt::Size
rPageRefSize );
+void setPageReferenceSize( const css::awt::Size rPageRefSize );
sal_Int32 getTotalPointCount() const { return m_nPointCount;}
double getXValue( sal_Int32 index ) const;
@@ -98,8 +92,8 @@ public:
boolhasPropertyMapping( const OUString rPropName ) const;
-::com::sun::star::uno::Sequence double getAllX() const;
-::com::sun::star::uno::Sequence double getAllY() const;
+css::uno::Sequence double getAllX() const;
+css::uno::Sequence double getAllY() const;
double getXMeanValue() const;
double getYMeanValue() const;
@@ -109,45 +103,41 @@ public:
sal_Int32 detectNumberFormatKey( sal_Int32 nPointIndex ) const;
boolshouldLabelNumberFormatKeyBeDetectedFromYAxis() const;
-sal_Int32 getLabelPlacement( sal_Int32 nPointIndex, const
::com::sun::star::uno::Reference ::com::sun::star::chart2::XChartType
xChartType
-, sal_Int32 nDimensionCount, bool bSwapXAndY ) const;
+sal_Int32 getLabelPlacement(
+sal_Int32 nPointIndex, const
css::uno::Referencecss::chart2::XChartType xChartType,
+sal_Int32 nDimensionCount, bool bSwapXAndY ) const;
-::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
-getPropertiesOfPoint( sal_Int32 index ) const;
+css::uno::Referencecss::beans::XPropertySet getPropertiesOfPoint(
sal_Int32 index ) const;
-::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
-getPropertiesOfSeries() const { return
css::uno::Referencecss::beans::XPropertySet(m_xDataSeries,
css::uno::UNO_QUERY );}
+css::uno::Referencecss::beans::XPropertySet getPropertiesOfSeries()
const;
-::com::sun::star::chart2::Symbol*
-getSymbolProperties( sal_Int32 index ) const;
+css::chart2::Symbol* getSymbolProperties( sal_Int32 index ) const;
-::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
-getXErrorBarProperties( sal_Int32 index ) const;
+css::uno::Referencecss::beans::XPropertySet getXErrorBarProperties(
sal_Int32 index ) const;
-::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
-getYErrorBarProperties( sal_Int32 index ) const;
+
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/dialogs/dlg_ChartType.cxx |2 -
chart2/source/controller/dialogs/tp_ChartType.cxx |7 +++--
chart2/source/controller/dialogs/tp_ChartType.hxx |2 -
chart2/uiconfig/ui/tp_ChartType.ui | 27 ++---
4 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 66178fc9dd8427a3bce55feb5ccb7e54c288f8ae
Author: Katarina Behrens bu...@bubli.org
Date: Tue Jul 22 22:57:03 2014 +0200
fdo#81547, part2: show only relevant widgets in layout tabpage
Set initial status of most of the widgets in .ui file to hidden,
*ResourceGroup::showControls() method will take care of showing
them when appropriate
Change-Id: I19d8df661ea7ee122e06ab854a9eb0a5edf62320
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 49620c7..4acb338 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -47,7 +47,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent
uno::ReferenceXChartDocument::query(m_xChartModel),
m_xCC,
true/*live update*/,
-true/*hide title description*/);
+false/*don't show title description*/);
m_pChartTypeTabPage-initializePage();
m_pChartTypeTabPage-Show();
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 0e313b6..00defcf 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -678,7 +678,7 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl)
ChartTypeTabPage::ChartTypeTabPage(Window* pParent
, const uno::Reference XChartDocument xChartModel
, const uno::Reference uno::XComponentContext xContext
-, bool bDoLiveUpdate, bool bHideDescription)
+, bool bDoLiveUpdate, bool bShowDescription)
: OWizardPage(pParent, tp_ChartType,
modules/schart/ui/tp_ChartType.ui)
, m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(this) )
@@ -702,9 +702,9 @@ ChartTypeTabPage::ChartTypeTabPage(Window* pParent
m_pSubTypeList-set_width_request(aSize.Width());
m_pSubTypeList-set_height_request(aSize.Height());
-if( bHideDescription )
+if( bShowDescription )
{
-m_pFT_ChooseType-Hide();
+m_pFT_ChooseType-Show();
}
else
{
@@ -914,6 +914,7 @@ void ChartTypeTabPage::selectMainType()
void ChartTypeTabPage::showAllControls( ChartTypeDialogController
rTypeController )
{
+m_pMainTypeList-Show();
m_pSubTypeList-Show();
bool bShow = rTypeController.shouldShow_3DLookControl();
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx
b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 4d3229a..81557a4 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -53,7 +53,7 @@ public:
::com::sun::star::chart2::XChartDocument xChartModel
, const ::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext xContext
-, bool bDoLiveUpdate, bool bHideDescription = false );
+, bool bDoLiveUpdate, bool bShowDescription = true );
virtual ~ChartTypeTabPage();
virtual voidinitializePage() SAL_OVERRIDE;
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui
b/chart2/uiconfig/ui/tp_ChartType.ui
index 8c61c43..242cd62 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -47,7 +47,7 @@
property name=spacing6/property
child
object class=GtkLabel id=FT_CAPTION_FOR_WIZARD
-property name=visibleTrue/property
+property name=visibleFalse/property
property name=can_focusFalse/property
property name=xalign0/property
property name=label translatable=yesChoose a Chart
Type/property
@@ -76,7 +76,7 @@
property name=row_spacing6/property
child
object class=svtlo-ValueSet id=subtype:border
-property name=visibleTrue/property
+property name=visibleFalse/property
property name=can_focusFalse/property
property name=hexpandTrue/property
/object
@@ -100,7 +100,7 @@
child
object class=GtkCheckButton id=3dlook
property name=label translatable=yes_3D
Look/property
-property name=visibleTrue/property
+property name=visibleFalse/property
property name=can_focusTrue/property
property name=receives_defaultFalse/property
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/htmlexport/data/fdo81276.html | 21 +
sw/qa/extras/htmlexport/htmlexport.cxx | 13 +
sw/source/filter/html/htmlcss1.cxx |2 +-
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 7dff37c65e08985b80ac79e13f5571819a8e739d
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 22 23:34:40 2014 +0200
fdo#81276: sw: HTML import: fix inverted test in CSS import
(regression from 5089bdb234a93bcb62b597c18b8ab66048246b13)
Change-Id: I5b45c4c47ba66385b2b528b5a3039bda37b060d6
diff --git a/sw/qa/extras/htmlexport/data/fdo81276.html
b/sw/qa/extras/htmlexport/data/fdo81276.html
new file mode 100644
index 000..653f6b1
--- /dev/null
+++ b/sw/qa/extras/htmlexport/data/fdo81276.html
@@ -0,0 +1,21 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN
+html lang=ru-ru
+head
+meta http-equiv=content-type content=text/html; charset=UTF-8
+meta charset=utf-8
+style
+
+@page { size: 29.7cm 21cm;
+margin-left: 0.5cm;
+margin-right: 0.5cm;
+margin-top: 2cm;
+margin-bottom: 0.5cm
+}
+
+/style
+/head
+
+body
+
+/body
+/html
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index fc0caf4..5fd15ab 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -72,6 +72,19 @@ private:
#define DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, HtmlExportTest)
+DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo81276, fdo81276.html)
+{
+uno::Referencecontainer::XNameAccess
xPageStyles(getStyles(PageStyles));
+uno::Referencebeans::XPropertySet xStyle(xPageStyles-getByName(HTML),
uno::UNO_QUERY);
+// some rounding going on here?
+CPPUNIT_ASSERT(abs(sal_Int32(29700) - getPropertysal_Int32(xStyle,
Width)) 10);
+CPPUNIT_ASSERT(abs(sal_Int32(21006) - getPropertysal_Int32(xStyle,
Height)) 10);
+CPPUNIT_ASSERT(abs(sal_Int32(500) - getPropertysal_Int32(xStyle,
LeftMargin)) 10);
+CPPUNIT_ASSERT(abs(sal_Int32(500) - getPropertysal_Int32(xStyle,
RightMargin)) 10);
+CPPUNIT_ASSERT(abs(sal_Int32(2000) - getPropertysal_Int32(xStyle,
TopMargin)) 10);
+CPPUNIT_ASSERT(abs(sal_Int32(500) - getPropertysal_Int32(xStyle,
BottomMargin)) 10);
+}
+
DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo62336, fdo62336.docx)
{
// The problem was essentially a crash during table export as docx/rtf/html
diff --git a/sw/source/filter/html/htmlcss1.cxx
b/sw/source/filter/html/htmlcss1.cxx
index ebdcd0d..100dd1f 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1688,7 +1688,7 @@ void SwHTMLParser::NewStyle()
sType = rOption.GetString();
}
-bIgnoreRawData = !sType.getLength()
+bIgnoreRawData = sType.getLength()
!sType.getToken(0,';').equalsAscii(sCSS_mimetype);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/commands.sh
test-bugzilla-files/commands.sh | 39 +++ 1 file changed, 39 insertions(+) New commits: commit c68380e5884adf88c4d49c58479d2f73b9bc1cfd Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Jul 22 18:33:05 2014 -0400 add command script for crash testing It contains all the steps necessary to run a crash testing session and upload the results to gimli. diff --git a/test-bugzilla-files/commands.sh b/test-bugzilla-files/commands.sh new file mode 100755 index 000..5ae544d --- /dev/null +++ b/test-bugzilla-files/commands.sh @@ -0,0 +1,39 @@ +cd /srv/crashtestdata/ +rm nohup.put +rm tmpdir/* -r +rm current/* -r +rm control/* -r +cd ~/build/ +make clean +cd ~/source/dev-tools/ +git pull -r +cd ~/source/libo-core/ +git pull -r +SHA=`git rev-parse HEAD` +echo $SHA +mkdir /srv/crashtestdata/logs/$SHA +cd ~/build/ +make +cd /srv/crashtestdata/files/ +python3 new-control.py +cd /srv/crashtestdata/control/ +zip -r control.zip */* +mv control.zip /srv/crashtestdata/logs/$SHA/. +cd /srv/crashtestdata/current/srv/crashtestdata/files/ +zip -r validation.zip */*.log +mv validation.zip /srv/crashtestdata/logs/$SHA/. +cd /srv/crashtestdata/logs/$SHA +unzip control.zip +unzip validation.zip -d validation +rm *.zip +cp ~/source/dev-tools/test-bugzilla-files/analyze-logs.py . +cp ../*.csv . +python3 analyze-logs.py +cp *.csv ../. +cd .. +zip -r current.zip $SHA/* +scp current.zip upl...@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/crashtest/. +ssh upl...@gimli.documentfoundation.org 'bash -s' 'ENDSSH' +cd /srv/www/dev-builds.libreoffice.org/crashtest/ +unzip current.zip +ENDSSH ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #192 from mchan...@shaw.ca --- Re bug #76565 One obvious use for the input field is for serial or identification numbers that must be printed on several different forms or several times in one page, information that is often provided from another electronic source and which is extremely prone to human error if manually retyped instead of copied. The current implementation breaks the ability to paste this kind of information into a template that was designed around the old method. The entire interface is currently designed to make the user think that whatever they need to do to edit an input field should be done by clicking and then inserting the information and not by using a non-obvious keyboard shortcut (Ctrl-F9) or going into the variables menu in a manner that defeats the entire purpose of an input field. We're talking about a difference of maybe 1-3 seconds for the old implementation versus 10-20 seconds for each field that requires pasted data. When you're dealing with dozens of these fields in an office full of distractions and urgent interruptions (the kind where you must open up a new document and work on something else, meaning you lose your place in what you were doing before) this adds up to significant loss of productivity. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/VDataSeries.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 4ca819b204e6c93c4b4e20b191100aa248b8ff23
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jul 22 18:58:33 2014 -0400
Simplify.
Change-Id: Ibbaf20abd2cb4f2b9ef0014969db827ccffa0c0d
diff --git a/chart2/source/view/main/VDataSeries.cxx
b/chart2/source/view/main/VDataSeries.cxx
index 99776b2..ccbd845 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -1032,9 +1032,8 @@ bool VDataSeries::getTextLabelMultiPropertyLists(
sal_Int32 index
{
LabelPositionHelper::doDynamicFontResize( *pPropValues, *pPropNames,
xTextProp, m_aReferenceSize );
}
-if(pPropNamespPropValues)
-return true;
-return false;
+
+return (pPropNames pPropValues);
}
void VDataSeries::setMissingValueTreatment( sal_Int32 nMissingValueTreatment )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||81511 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #47 from Joel Madero jmadero@gmail.com --- Added bug 81511 - dictionaries completely broken in 4.3.0.3 rc (works fine in beta1) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Windows OS dictionary and spell check madness, going to need to roll another RC build for 4.3.0
Cloph, *, Windows only RC3 issue fdo#81511 https://bugs.freedesktop.org/show_bug.cgi?id=81511has corrupted spelling check--every word is marked wrong; looks to be patched already per fdo#80363 https://bugs.freedesktop.org/show_bug.cgi?id=80363 ) but that needs to be confirmed. Anyway, can't go to final with the 4.3.0.3 build doing this. Stuart -- View this message in context: http://nabble.documentfoundation.org/Windows-OS-dictionary-and-spell-check-madness-going-to-need-to-roll-another-RC-build-for-4-3-0-tp4116427.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: Branch 'libreoffice-4-3' - connectivity/registry connectivity/source dbaccess/source reportbuilder/java
connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu |2
+-
connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu |2
+-
connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu |2
+-
connectivity/source/commontools/dbmetadata.cxx |2
+-
connectivity/source/drivers/jdbc/JDriver.cxx|2
+-
connectivity/source/drivers/odbc/ODriver.cxx|2
+-
dbaccess/source/core/dataaccess/ModelImpl.cxx |2
+-
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java|4
++--
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 0d5d8c22f7be41d408d8ee4012ef1a6f4368423e
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jul 22 18:36:05 2014 +0200
Resolves fdo#81213: Wrong table-clause generated by reportbuilder
Oracle doesn't accept AS for making an alias from a table
See https://bugs.freedesktop.org/show_bug.cgi?id=81213#c2
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c4
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c5
for more information
(thank you Lionel)
Cherry-picked from 568778874429595855b435792e5ebecd52956dae
Change-Id: I33c86d78b2590116d4af46ffd3e54c3c791268ea
Reviewed-on: https://gerrit.libreoffice.org/10469
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git
a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 34e85f4..210a9b7 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -50,7 +50,7 @@
/node
node oor:name=UseKeywordAsBeforeAlias oor:op=replace
prop oor:name=Value oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
/node
node oor:name=UseBracketedOuterJoinSyntax oor:op=replace
diff --git
a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index f462444..dc8b317 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -75,7 +75,7 @@
/node
node oor:name=UseKeywordAsBeforeAlias oor:op=replace
prop oor:name=Value oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
/node
node oor:name=UseBracketedOuterJoinSyntax oor:op=replace
diff --git
a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index e660674..8711eda 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -80,7 +80,7 @@
/node
node oor:name=UseKeywordAsBeforeAlias oor:op=replace
prop oor:name=Value oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
/node
node oor:name=UseBracketedOuterJoinSyntax oor:op=replace
diff --git a/connectivity/source/commontools/dbmetadata.cxx
b/connectivity/source/commontools/dbmetadata.cxx
index 75fcc66..73246c2 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -291,7 +291,7 @@ namespace dbtools
bool DatabaseMetaData::generateASBeforeCorrelationName() const
{
-bool doGenerate( true );
+bool doGenerate( false );
Any setting;
if ( lcl_getConnectionSetting( GenerateASBeforeCorrelationName,
*m_pImpl, setting ) )
OSL_VERIFY( setting = doGenerate );
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx
b/connectivity/source/drivers/jdbc/JDriver.cxx
index b9ea306..a22df42 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -192,7 +192,7 @@ Sequence DriverPropertyInfo SAL_CALL
java_sql_Driver::getPropertyInfo( const
OUString(GenerateASBeforeCorrelationName)
,OUString(Generate AS before table correlation names.)
,sal_False
-,OUString( true )
+,OUString( false )
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx
b/connectivity/source/drivers/odbc/ODriver.cxx
index b6ead37..eb690a0 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -178,7 +178,7 @@
LibreOffice Gerrit News for core on 2014-07-22
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#80907 Implemented OOXMLFactory_ns using boost::intrusive_ptr. in https://gerrit.libreoffice.org/10399 from Fahad Al-Saidi about module writerfilter + fdo#76754 Speed up registration of new listeners to SfxBroadcaster in https://gerrit.libreoffice.org/10344 from Tobias Lippert about module include, sd, svl, svx, sw + Add unittests for SfxBroadcaster in https://gerrit.libreoffice.org/10343 from Tobias Lippert about module include, svl + l10ntools: fixes and improvements for transex3 executable in https://gerrit.libreoffice.org/10212 from Douglas Mencken about module l10ntools + fdo#78304:Image in header is not getting preserved. in https://gerrit.libreoffice.org/10386 from Sourav Mahajan about module sw + OSX: change CXXFLAGS_CXX11 to be used not only with clang in https://gerrit.libreoffice.org/10130 from Douglas Mencken about module build, solenv End of freshness + remove dead code in https://gerrit.libreoffice.org/10284 from Noel Grandin about module include + Use better coordinates for unit test of fdo#77229 in https://gerrit.libreoffice.org/10447 from Arnaud Versini about module cppcanvas + FILESAVE [DOCX] Hyperlink text is getting lost after RT fdo#81492 in https://gerrit.libreoffice.org/10441 from Vinaya Mandke about module sw, writerfilter + new loplugin: VCL widget reference checker in https://gerrit.libreoffice.org/10427 from Noel Grandin about module compilerplugins * Merged changes on master for project core changed in the last 25 hours: + win32 fpicker: correctly set the default file name in https://gerrit.libreoffice.org/10430 from Aurimas Fišeras + Revert Cleaning: remove use of old edt1 from dlg.h (Windows) in https://gerrit.libreoffice.org/10429 from Aurimas Fišeras + fdo#79343 When searching in Draw or Impress, leave focus in search bar in https://gerrit.libreoffice.org/10362 from Alex Henrie + Rename FILED_BIBLIOGRAPHY to FIELD_BIBLIOGRAPHY in https://gerrit.libreoffice.org/10443 from Joren De Cuyper + fdo#80902: Document grid type is not rendered properly in https://gerrit.libreoffice.org/10224 from Priyanka Gaikwad + fd0#80997: Fix for text missing which is behind textbox in RT. in https://gerrit.libreoffice.org/10228 from Rohit Deshmukh + fdo#78663 : The File gets corrupted when saved in LO in https://gerrit.libreoffice.org/10229 from BisalNayal + fdo#81381 Objects:Icon is not editable after LO Export in https://gerrit.libreoffice.org/10356 from Ravindra Vidhate + fdo#80897: Preservation of text warp properties. in https://gerrit.libreoffice.org/10378 from Rohit Deshmukh + fdo#81380: LO crashes while opening the document in https://gerrit.libreoffice.org/10379 from Dinesh Patil + fdo#81489: Tweak the color in 'Insert Row/Column' to increase its visibil in https://gerrit.libreoffice.org/10412 from Adolfo Jayme Barrientos + fdo#80651 - Add 'Single Page' button to Page Preview Toolbar in https://gerrit.libreoffice.org/10053 from Joren De Cuyper + fdo#80536 UI: Menu entry for 'Edit File' - 'Edit Mode' in https://gerrit.libreoffice.org/10211 from Joren De Cuyper + fdo#81532 Handle symlinks to icon themes correctly in https://gerrit.libreoffice.org/10406 from Tobias Lippert * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + fdo#45286: Fix for saving a file as.xlsx destroys link to linked contents in https://gerrit.libreoffice.org/10104 from Robin Kumar + __arm and __arm64 don't exist when building for the simulator. in https://gerrit.libreoffice.org/10103 from Andrzej Hunt + attempt in https://gerrit.libreoffice.org/9939 from Michael Stahl + fdo#78947 : The File gets corrupted when saved in LO in https://gerrit.libreoffice.org/9775 from BisalNayal + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + fdo#77121 Header / Footer positions not preserved after RT in
LibreOffice Gerrit News for submodules on 2014-07-22
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + Fix fdo#80433 help pages for new T functions in https://gerrit.libreoffice.org/10426 from Olivier Hallot + Fix for fdo#80450: MS excel F functions help pages in https://gerrit.libreoffice.org/10424 from Olivier Hallot + Fix fdo#80451: New DIST functions from Excel in https://gerrit.libreoffice.org/10423 from Olivier Hallot + Fix fdo#80436 Help pages for MODE functions in https://gerrit.libreoffice.org/10411 from Olivier Hallot + Fix fdo#80447: Help pages for MS BINOM functions in https://gerrit.libreoffice.org/10409 from Olivier Hallot + Fix fdo#80449: help text for CONFIDENCE functions in https://gerrit.libreoffice.org/10408 from Olivier Hallot * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svl svl/CppunitTest_svl_notify.mk svl/Module_svl.mk svl/qa
include/svl/SfxBroadcaster.hxx |7 +-
svl/CppunitTest_svl_notify.mk | 36 ++
svl/Module_svl.mk |1
svl/qa/unit/notify/test_SfxBroadcaster.cxx | 98 +
4 files changed, 139 insertions(+), 3 deletions(-)
New commits:
commit 312926823dc6da7e87eb60c98ba084f14f0aa676
Author: Tobias Lippert d...@fastmail.fm
Date: Fri Jun 20 11:01:30 2014 +0200
Add unittests for SfxBroadcaster
Change-Id: I9ecd8fec395eafbdc2675dda9fa25ac32761123c
Reviewed-on: https://gerrit.libreoffice.org/10343
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index 8fd62b9..5c135b5 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -25,12 +25,10 @@
class SfxListener;
class SfxHint;
-
-
+class SfxBroadcasterTest;
class SVL_DLLPUBLIC SfxBroadcaster
{
-friend class SfxListener;
typedef std::vectorSfxListener* SfxListenerArr_Impl;
SfxListenerArr_Impl m_Listeners;
@@ -61,6 +59,9 @@ public:
{
return m_Listeners[nNo];
}
+
+friend class SfxListener;
+friend class ::SfxBroadcasterTest;
};
#endif
diff --git a/svl/CppunitTest_svl_notify.mk b/svl/CppunitTest_svl_notify.mk
new file mode 100644
index 000..ff1dbe7
--- /dev/null
+++ b/svl/CppunitTest_svl_notify.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,svl_notify))
+
+$(eval $(call gb_CppunitTest_use_external,svl_notify,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,svl_notify, \
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,svl_notify, \
+ svl/qa/unit/notify/test_SfxBroadcaster \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,svl_notify, \
+ svl \
+ comphelper \
+ sal \
+ cppu \
+ cppuhelper \
+))
+
+$(eval $(call gb_CppunitTest_set_include,svl_notify,\
+ -I$(SRCDIR)/svl/source/inc \
+ $$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index 7589030..54f6b6c 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_check_targets,svl,\
CppunitTest_svl_inetcontenttype \
CppunitTest_svl_items \
CppunitTest_svl_itempool \
+ CppunitTest_svl_notify \
))
#TODO: CppunitTest_svl_urihelper depends on ucb, can only be added once svl is
diff --git a/svl/qa/unit/notify/test_SfxBroadcaster.cxx
b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
new file mode 100644
index 000..8139ed1
--- /dev/null
+++ b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include svl/SfxBroadcaster.hxx
+
+#include svl/lstner.hxx
+#include svl/hint.hxx
+
+#include cppunit/TestAssert.h
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+
+class SfxBroadcasterTest : public CppUnit::TestFixture
+{
+void AddingListenersIncreasesCount();
+void RemovingListenersDecreasesCount();
+void HintsAreNotForwardedToRemovedListeners();
+
+// Adds code needed to register the test suite
+CPPUNIT_TEST_SUITE(SfxBroadcasterTest);
+CPPUNIT_TEST(AddingListenersIncreasesCount);
+//CPPUNIT_TEST(RemovingListenersDecreasesCount);
+CPPUNIT_TEST(HintsAreNotForwardedToRemovedListeners);
+
+CPPUNIT_TEST_SUITE_END();
+};
+
+class MockedSfxListener : public SfxListener
+{
+public:
+MockedSfxListener()
+: mNotifyWasCalled(false) {}
+
+void Notify(SfxBroadcaster rBC, const SfxHint rHint) SAL_OVERRIDE {
+(void)(rBC); (void)(rHint); // avoid warnings about unused parameters
+mNotifyWasCalled = true;
+}
+
+bool NotifyWasCalled() const {
+return mNotifyWasCalled;
+}
+
+private:
+bool mNotifyWasCalled;
+};
+
+void
+SfxBroadcasterTest::AddingListenersIncreasesCount()
+{
+SfxBroadcaster sb;
+MockedSfxListener sl;
+
+CPPUNIT_ASSERT_EQUAL((size_t)0, sb.GetListenerCount());
+
+sl.StartListening(sb, true);
+CPPUNIT_ASSERT_EQUAL((size_t)1, sb.GetListenerCount());
+}
+
+void
+SfxBroadcasterTest::RemovingListenersDecreasesCount()
+{
+SfxBroadcaster sb;
+
[Libreoffice-commits] core.git: include/svl sd/source svl/qa svl/source svx/source sw/source
include/svl/SfxBroadcaster.hxx | 19 +---
sd/source/core/stlpool.cxx |2 -
sd/source/core/stlsheet.cxx|2 -
svl/qa/unit/notify/test_SfxBroadcaster.cxx |2 -
svl/source/notify/SfxBroadcaster.cxx | 33 +++--
svx/source/svdraw/svdmark.cxx |2 -
svx/source/svdraw/svdviter.cxx |2 -
sw/source/core/unocore/unostyle.cxx|2 -
8 files changed, 39 insertions(+), 25 deletions(-)
New commits:
commit 798379313dca8de97e431ef2fe68129aaa1dcf04
Author: Tobias Lippert d...@fastmail.fm
Date: Fri Jul 18 15:36:30 2014 +0200
fdo#76754 Speed up registration of new listeners to SfxBroadcaster
Also change behavior for the GetListenerCount() method which now
returns the count of listeners.
The previous behavior is available in method GetSizeOfVector().
Change-Id: I5b03fa55a309f4ff5aea5e8830c137786fc07e89
Reviewed-on: https://gerrit.libreoffice.org/10344
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index 5c135b5..a29a5c0 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -31,6 +31,8 @@ class SVL_DLLPUBLIC SfxBroadcaster
{
typedef std::vectorSfxListener* SfxListenerArr_Impl;
+/** Contains the positions of removed listeners. */
+std::vectorsize_t m_RemovedPositions;
SfxListenerArr_Impl m_Listeners;
private:
@@ -51,12 +53,21 @@ public:
voidBroadcast( const SfxHint rHint );
boolHasListeners() const;
-size_t GetListenerCount() const
-{
+
+/** Get the number of listeners which are registered at this broadcaster */
+size_t GetListenerCount() const;
+
+/** Get the size of the internally stored vector.
+ * Use it to iterate over all listeners.
+ */
+size_t GetSizeOfVector() const {
return m_Listeners.size();
}
-SfxListener*GetListener( size_t nNo ) const
-{
+
+/** Get a listener by its position in the internally stored vector.
+ * Note that this method may return NULL
+ */
+SfxListener*GetListener( size_t nNo ) const {
return m_Listeners[nNo];
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index bee0b1e..cb11f73 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1440,7 +1440,7 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList(
SdStyleSheet* pSheet )
{
SdStyleSheetVector aResult;
-const size_t nListenerCount = pSheet-GetListenerCount();
+const size_t nListenerCount = pSheet-GetSizeOfVector();
for (size_t n = 0; n nListenerCount; ++n)
{
SdStyleSheet* pChild = dynamic_cast SdStyleSheet* (
pSheet-GetListener(n) );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 5492599..4246e31 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -325,7 +325,7 @@ bool SdStyleSheet::IsUsed() const
{
bool bResult = false;
-const size_t nListenerCount = GetListenerCount();
+const size_t nListenerCount = GetSizeOfVector();
for (size_t n = 0; n nListenerCount; ++n)
{
SfxListener* pListener = GetListener(n);
diff --git a/svl/qa/unit/notify/test_SfxBroadcaster.cxx
b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
index 8139ed1..6096029 100644
--- a/svl/qa/unit/notify/test_SfxBroadcaster.cxx
+++ b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
@@ -26,7 +26,7 @@ class SfxBroadcasterTest : public CppUnit::TestFixture
// Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(SfxBroadcasterTest);
CPPUNIT_TEST(AddingListenersIncreasesCount);
-//CPPUNIT_TEST(RemovingListenersDecreasesCount);
+CPPUNIT_TEST(RemovingListenersDecreasesCount);
CPPUNIT_TEST(HintsAreNotForwardedToRemovedListeners);
CPPUNIT_TEST_SUITE_END();
diff --git a/svl/source/notify/SfxBroadcaster.cxx
b/svl/source/notify/SfxBroadcaster.cxx
index 2fe7903..3aa493d 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -88,15 +88,15 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster rBC )
void SfxBroadcaster::AddListener( SfxListener rListener )
{
-for (size_t i = 0; i m_Listeners.size(); ++i)
-{
-if (!m_Listeners[i]) // removed by RemoveListener?
-{
-m_Listeners[i] = rListener;
-return;
-}
+if (m_RemovedPositions.empty()) {
+m_Listeners.push_back(rListener);
+}
+else {
+size_t targetPosition = m_RemovedPositions.back();
+m_RemovedPositions.pop_back();
+assert(m_Listeners[targetPosition] == NULL);
+m_Listeners[targetPosition] = rListener;
}
-
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/hyperlinkdocpage.ui | 102 +--- 1 file changed, 3 insertions(+), 99 deletions(-) New commits: commit 8ebf706245faea61527db5f94e77bbdca0379584 Author: Szymon KÅos eszka...@gmail.com Date: Tue Jul 22 09:37:14 2014 +0200 deleted superfluous controls that didn't exist before conversion Change-Id: Iba700d79466c24395a6a0b07300cd4190ef03ff7 Reviewed-on: https://gerrit.libreoffice.org/10450 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui index f1bc48d..e36c818 100644 --- a/cui/uiconfig/ui/hyperlinkdocpage.ui +++ b/cui/uiconfig/ui/hyperlinkdocpage.ui @@ -31,60 +31,6 @@ property name=row_spacing6/property property name=column_spacing12/property child - object class=GtkGrid id=grid2 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=hexpandTrue/property -property name=row_spacing6/property -property name=column_spacing12/property -child - object class=GtkRadioButton id=linktyp_mail -property name=label translatable=yes_E-mail/property -property name=use_action_appearanceFalse/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=activeTrue/property -property name=draw_indicatorTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkRadioButton id=linktyp_news -property name=label translatable=yes_News/property -property name=use_action_appearanceFalse/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=activeTrue/property -property name=draw_indicatorTrue/property -property name=grouplinktyp_mail/property - /object - packing -property name=left_attach1/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child - /object - packing -property name=left_attach1/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child object class=GtkLabel id=path_label property name=visibleTrue/property property name=can_focusFalse/property @@ -96,7 +42,7 @@ /object packing property name=left_attach0/property -property name=top_attach1/property +property name=top_attach0/property property name=width1/property property name=height1/property /packing @@ -110,7 +56,7 @@ /object packing property name=left_attach1/property -property name=top_attach1/property +property name=top_attach0/property property name=width1/property property name=height1/property /packing @@ -126,52 +72,11 @@ /object packing property name=left_attach2/property -property name=top_attach1/property -property name=width1/property -property name=height1/property - /packing -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b89895582b6fd10f5f9e437fd966412bcc15e4a9 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 09:15:59 2014 +0100 Updated core Project: help 10fd3e1326ecf705030189e233a895be7918ea72 diff --git a/helpcontent2 b/helpcontent2 index b8feece..10fd3e1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b8feecec406652bb24799a209aae9530da926f4a +Subproject commit 10fd3e1326ecf705030189e233a895be7918ea72 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|2 -- source/text/shared/explorer/database/migrate_macros.xhp |2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit 10fd3e1326ecf705030189e233a895be7918ea72 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 09:15:59 2014 +0100 update help ids for summary page .ui conversion Change-Id: Ife99575dbcdcedb0dfad2415f419de3501849651 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ccbf62c..9e7049b 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5024,7 +5024,6 @@ dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, dbaccess_ModalDialog_DLG_PARAMETERS,1388396544, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, -dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426, dbaccess_MultiListBox_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES,851610626, dbaccess_NumericField_DLG_ADABASSTAT_ET_MEMORYUSING,1388615683, dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778, @@ -5054,7 +5053,6 @@ dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240, dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080, dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936, dbaccess_TabPage_TP_MIGRATE,851476480, -dbaccess_TabPage_TP_SUMMARY,851492864, desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859, desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011, desktop_Edit_TP_USER_ED_USER_FATHER,586123282, diff --git a/source/text/shared/explorer/database/migrate_macros.xhp b/source/text/shared/explorer/database/migrate_macros.xhp index 6ea336b..9e54904 100644 --- a/source/text/shared/explorer/database/migrate_macros.xhp +++ b/source/text/shared/explorer/database/migrate_macros.xhp @@ -40,7 +40,7 @@ /section bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/browse id=bm_id022420091141368 localize=false/ paragraph xml-lang=en-US id=par_id0224200911454780 role=paragraph l10n=NEWahelp hid=. visibility=hiddenChoose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string backup in the name./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES id=bm_id0224200911450172 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/summarypage/textview id=bm_id0224200911450172 localize=false/ paragraph xml-lang=en-US id=par_id022420091145472 role=paragraph l10n=NEWahelp hid=. visibility=hiddenThe list shows all changes that were applied to the database file./ahelp/paragraph paragraph xml-lang=en-US id=par_id0112200902353542 role=paragraph l10n=NEWPreviously, macros have been allowed to reside only in the text sub-documents of forms and reports. Now macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view./paragraph paragraph xml-lang=en-US id=par_id0112200903075865 role=paragraph l10n=NEWHowever, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. /paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |1 - 1 file changed, 1 deletion(-) New commits: commit 464cbfaaa198f58af8cb2c347f4367408464fc2e Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 09:53:53 2014 +0100 remove unused helpids Change-Id: Ibfc3d464fdf7206ed95c3183e941801b3de0b4a2 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 9e7049b..1e049d2 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5052,7 +5052,6 @@ dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928, dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240, dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080, dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936, -dbaccess_TabPage_TP_MIGRATE,851476480, desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859, desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011, desktop_Edit_TP_USER_ED_USER_FATHER,586123282, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00639459f148ecb8033f42d5f810858729d24501 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 09:53:53 2014 +0100 Updated core Project: help 464cbfaaa198f58af8cb2c347f4367408464fc2e diff --git a/helpcontent2 b/helpcontent2 index 10fd3e1..464cbfa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 10fd3e1326ecf705030189e233a895be7918ea72 +Subproject commit 464cbfaaa198f58af8cb2c347f4367408464fc2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ecbc20d0c7d58c3c6cd0e1c517848157107120a0 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 10:12:39 2014 +0100 Updated core Project: help f9ce693a67d940f48f5f9c7e2a76213cc97c092c diff --git a/helpcontent2 b/helpcontent2 index 464cbfa..f9ce693 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 464cbfaaa198f58af8cb2c347f4367408464fc2e +Subproject commit f9ce693a67d940f48f5f9c7e2a76213cc97c092c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|1 - source/text/shared/explorer/database/migrate_macros.xhp |3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit f9ce693a67d940f48f5f9c7e2a76213cc97c092c Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 22 10:12:39 2014 +0100 connect macro migration tabpages to help Change-Id: I2ab17e0790d3b032bc664051e190d31d3f2d7bac diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 1e049d2..164fc9b 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5020,7 +5020,6 @@ dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129, dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299, dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536, dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, -dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, dbaccess_ModalDialog_DLG_PARAMETERS,1388396544, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, diff --git a/source/text/shared/explorer/database/migrate_macros.xhp b/source/text/shared/explorer/database/migrate_macros.xhp index 9e54904..dd2b688 100644 --- a/source/text/shared/explorer/database/migrate_macros.xhp +++ b/source/text/shared/explorer/database/migrate_macros.xhp @@ -33,6 +33,9 @@ bookmark_valuemacros;attaching new (Base)/bookmark_value bookmark_valuemigrating macros (Base)/bookmark_value /bookmarkcommentMW added 2 index entries/comment +bookmark xml-lang=en-US branch=hid/dbaccess/ui/prepagepage/PreparePage id=bm_id0224200911450173 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/summarypage/SummaryPage id=bm_id0224200911450174 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/migratepage/MigratePage id=bm_id0224200911450175 localize=false/ bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/BackupPage id=bm_id022420091141366 localize=false/ paragraph xml-lang=en-US id=hd_id0112200902353472 role=heading level=1 l10n=NEWlink href=text/shared/explorer/database/migrate_macros.xhpMigrate Macros/link/paragraph bookmark xml-lang=en-US branch=hid/.uno:DBMigrateScripts id=bm_id0224200911384751 localize=false/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 8 commits - connectivity/source fpicker/source oox/source sal/osl sal/qa sal/rtl sc/source swext/mediawiki writerfilter/source
connectivity/source/parse/sqlbison.y|8 +- fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 17 +++-- oox/source/drawingml/textrun.cxx|3 - sal/osl/all/debugbase.cxx | 30 ++ sal/qa/osl/file/osl_File.cxx|4 - sal/qa/osl/module/osl_Module.cxx|8 +- sal/qa/osl/mutex/osl_Mutex.cxx |2 sal/qa/osl/process/osl_Thread.cxx |2 sal/qa/osl/security/osl_Security.cxx|2 sal/rtl/alloc_global.cxx|6 +- sal/rtl/hash.cxx|4 - sal/rtl/uri.cxx |2 sc/source/ui/dbgui/validate.cxx | 27 +++-- sc/source/ui/inc/validate.hxx |2 swext/mediawiki/src/filter/odt2mediawiki.xsl| 59 +--- writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 16 files changed, 114 insertions(+), 64 deletions(-) New commits: commit 504a70f2b8919203448813800e45aa46295c2f46 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jul 21 11:36:27 2014 +0200 Resolves fdo#81581: Mediawiki doesn't recognize underlining Cherry-picked from b8f4db5bad245c2e340b3217b10df994785eecd3 Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089 Reviewed-on: https://gerrit.libreoffice.org/10438 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 64474b3..1205536 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -118,23 +118,26 @@ !-- Italic character style. -- variable name=ITALIC_BIT select=2/ + !-- Underline character style. -- + variable name=UNDERLINE_BIT select=4/ + !-- Subscript character style. -- - variable name=SUBSCRIPT_BIT select=4/ + variable name=SUBSCRIPT_BIT select=8/ !-- Superscript character style. -- - variable name=SUPERSCRIPT_BIT select=8/ + variable name=SUPERSCRIPT_BIT select=16/ !-- Typewriter character style. -- - variable name=TYPEWRITER_BIT select=16/ + variable name=TYPEWRITER_BIT select=32/ !-- Preformatted text paragraph style. -- - variable name=CODE_BIT select=32/ + variable name=CODE_BIT select=64/ !-- Centered paragraph style. -- - variable name=CENTER_BIT select=64/ + variable name=CENTER_BIT select=128/ !-- Right aligned paragraph style. -- - variable name=RIGHT_BIT select=128/ + variable name=RIGHT_BIT select=256/ !-- Constant defining the empty style. -- variable name=NO_STYLE select=0/ @@ -976,6 +979,8 @@ select=($style mod (2 * $BOLD_BIT)) != 0/ variable name=italic select=($style mod (2 * $ITALIC_BIT)) - ($style mod ($ITALIC_BIT)) != 0/ + variable name=underline + select=($style mod (2 * $UNDERLINE_BIT)) - ($style mod ($UNDERLINE_BIT)) != 0/ variable name=superscript select=($style mod (2 * $SUPERSCRIPT_BIT)) - ($style mod ($SUPERSCRIPT_BIT)) != 0/ variable name=subscript @@ -989,6 +994,8 @@ select=($style-left mod (2 * $BOLD_BIT)) != 0/ variable name=italic-left select=($style-left mod (2 * $ITALIC_BIT)) - ($style-left mod ($ITALIC_BIT)) != 0/ + variable name=underline-left + select=($style-left mod (2 * $UNDERLINE_BIT)) - ($style-left mod ($UNDERLINE_BIT)) != 0/ variable name=superscript-left select=($style-left mod (2 * $SUPERSCRIPT_BIT)) - ($style-left mod ($SUPERSCRIPT_BIT)) != 0/ variable name=subscript-left @@ -1000,6 +1007,8 @@ select=($style-right mod (2 * $BOLD_BIT)) != 0/ variable name=italic-right select=($style-right mod (2 * $ITALIC_BIT)) - ($style-right mod ($ITALIC_BIT)) != 0/ + variable name=underline-right + select=($style-right mod (2 * $UNDERLINE_BIT)) - ($style-right mod ($UNDERLINE_BIT)) != 0/ variable name=superscript-right
[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/svtools svtools/source
dbaccess/source/ext/macromigration/dbmm_global.hrc | 10 +-
dbaccess/source/ext/macromigration/macromigration.hrc |9 --
dbaccess/source/ext/macromigration/macromigration.src | 43 +---
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 13 +--
dbaccess/source/ext/macromigration/macromigrationdialog.hxx |1
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 16
dbaccess/source/ext/macromigration/macromigrationpages.hxx |7 -
include/svtools/roadmapwizard.hxx |4 +
svtools/source/dialogs/roadmapwizard.cxx|7 +
9 files changed, 38 insertions(+), 72 deletions(-)
New commits:
commit 9c7a7d85aa6de5d4c384608dce157c420bc7c74f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 22 10:10:15 2014 +0100
convert DLG_MACRO_MIGRATION to widget layout
Change-Id: Ie4cef54a943fc456b042425b53286492a0bed0be
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc
b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 946b7a5..d32dafe 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -25,13 +25,8 @@
//= bases
#define RID_DBMM_DIALOG_START RID_DBACCESS_START + 0
-#define RID_DBMM_TAPPAGE_START RID_DBACCESS_START + 0
#define RID_DBMM_STRING_START RID_DBACCESS_START + 0
-//= dialogs
-
-#define DLG_MACRO_MIGRATION RID_DBMM_DIALOG_START + 0
-
//= error boxes
#define ERR_INVALID_BACKUP_LOCATION RID_DBMM_DIALOG_START + 0
@@ -58,6 +53,11 @@
#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 )
#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 )
#define STR_NOT_READONLY( RID_DBMM_STRING_START + 19 )
+#define STR_STATE_CLOSE_SUB_DOCS( RID_DBMM_STRING_START + 20 )
+#define STR_STATE_BACKUP_DBDOC ( RID_DBMM_STRING_START + 21 )
+#define STR_STATE_MIGRATE ( RID_DBMM_STRING_START + 22 )
+#define STR_STATE_SUMMARY ( RID_DBMM_STRING_START + 23 )
+#define STR_TITLE_MACRO_MIGRATION ( RID_DBMM_STRING_START + 24 )
#endif // DBACCESS_DBMM_GLOBAL_HRC
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc
b/dbaccess/source/ext/macromigration/macromigration.hrc
index 0cde314..e4bc293 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -24,12 +24,6 @@
#define TAB_PAGE_WIDTH 280
#define TAB_PAGE_HEIGHT 185
-//... strings
-#define STR_STATE_CLOSE_SUB_DOCS1
-#define STR_STATE_BACKUP_DBDOC 2
-#define STR_STATE_MIGRATE 3
-#define STR_STATE_SUMMARY 4
-
#endif // DBACCESS_MACROMIGRATION_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index ae07e00..4b797ed 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -18,37 +18,30 @@
*/
#include dbmm_global.hrc
-#include macromigration.hrc
-ModalDialog DLG_MACRO_MIGRATION
+String STR_TITLE_MACRO_MIGRATION
{
-HelpID = dbaccess:ModalDialog:DLG_MACRO_MIGRATION;
-OutputSize = TRUE ;
-Moveable = TRUE;
-Closeable = TRUE ;
-Hide = TRUE;
-
-Text[ en-US ] = Database Document Macro Migration ;
+Text [ en-US ] = Database Document Macro Migration ;
+};
-String STR_STATE_CLOSE_SUB_DOCS
-{
-Text [ en-US ] = Prepare;
-};
+String STR_STATE_CLOSE_SUB_DOCS
+{
+Text [ en-US ] = Prepare;
+};
-String STR_STATE_BACKUP_DBDOC
-{
-Text [ en-US ] = Backup Document;
-};
+String STR_STATE_BACKUP_DBDOC
+{
+Text [ en-US ] = Backup Document;
+};
-String STR_STATE_MIGRATE
-{
-Text [ en-US ] = Migrate;
-};
+String STR_STATE_MIGRATE
+{
+Text [ en-US ] = Migrate;
+};
-String STR_STATE_SUMMARY
-{
-Text [ en-US ] = Summary;
-};
+String STR_STATE_SUMMARY
+{
+Text [ en-US ] = Summary;
};
String STR_FORM
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 1f33032..1c007e3 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -126,16 +126,15 @@ namespace dbmm
};
// MacroMigrationDialog
-MacroMigrationDialog::MacroMigrationDialog( Window* _pParent, const
ReferenceXComponentContext _rContext,
-const Reference XOfficeDatabaseDocument _rxDocument )
-:MacroMigrationDialog_Base( _pParent, MacroMigrationResId(
DLG_MACRO_MIGRATION ) )
-,m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
+MacroMigrationDialog::MacroMigrationDialog(Window*
Re: [Libreoffice-qa] Second Opinion Needed
Couldn't agree more with Nino's answer. If people are loosing data (i.e. typed words while not looking at the screen) then there is a problem. It is NOT a BUG but it is clearly a LIMITATION. It must be possible to save in the background while input continues... Obviously the words typed since Autorecover starts will only be included in the next Autorecover... It should be changed to Enhancement instead of closing as NOTABUG Just my 2 cents... -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Second-Opinion-Needed-tp4116303p4116337.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [libreoffice-users] Bug Squashing Session in 90 Minutes
On Mon, 21 Jul 2014 20:06:01 +0200, Tommy ba...@quipo.it wrote: ... wow!!! count is 788 right now!!! not bad for a last minute thing!!! thumbs up. watch this chart!!! awesome!!! https://bugs.freedesktop.org/reports.cgi?product=LibreOfficedatasets=UNCONFIRMEDdatasets=NEEDINFO ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [libreoffice-users] Bug Squashing Session in 90 Minutes
Yeah bug count is currently sitting at 742 which is the lowest it has been in for over 2 years. With a push this week I think we can drop it to 700 :) Maybe the 500 goal wasn't so outlandish after all Best, Joel On 07/22/2014 08:12 AM, Tommy wrote: On Mon, 21 Jul 2014 20:06:01 +0200, Tommy ba...@quipo.it wrote: ... wow!!! count is 788 right now!!! not bad for a last minute thing!!! thumbs up. watch this chart!!! awesome!!! https://bugs.freedesktop.org/reports.cgi?product=LibreOfficedatasets=UNCONFIRMEDdatasets=NEEDINFO ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [libreoffice-users] Bug Squashing Session in 90 Minutes
Hi, 22 Tem 2014 18:22 tarihinde Joel Madero jmadero@gmail.com yazdı: Yeah bug count is currently sitting at 742 which is the lowest it has been in for over 2 years. With a push this week I think we can drop it to 700 :) Maybe the 500 goal wasn't so outlandish after all Tweeting from @LibreOfficeBugs account can be good for promotion of the session. Also these are great news of success and deserve to be shared :) Best regards Zeki ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 81643] Borders are drawn as rectangles and so they are not joined well at the corners
https://bugs.freedesktop.org/show_bug.cgi?id=81643 Zolnai Tamás zolnaitamas2...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77452] PDF: Font in form control box
https://bugs.freedesktop.org/show_bug.cgi?id=77452 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Owen Genat owen.ge...@gmail.com --- (In reply to comment #0) 2. Try to change font from default to Times New Roman using format character How are you attempting this? If I right-click on the form control text box while in design mode Control... General tab there is a Font field where the font of the input text can be set. It is also possible to set the Text type to Multi-line with formatting. 3. try changing text box to formatted field Right-click on text box Replace with select the type of object required. Does this do what is required? Both work as expected here under MacOS 10.6.8 using v4.3.0.3 Build ID: fcd3838c4097f7817b5b3984fd88a44e1edd8548 (x86). Status set to NEEDINFO. Please change the status back to UNCONFIRMED once the request information is provided. Thanks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77452] PDF: Font in form control box
https://bugs.freedesktop.org/show_bug.cgi?id=77452 --- Comment #2 from Owen Genat owen.ge...@gmail.com --- Sorry, I have just realised that this report is against the Drawing component and the title mentions PDF (presumably for editing). If this is indeed the case, please disregard comment 1. I can still change (and save) the text input into a PDF form text box field under the indicated version, but I can only do so one line of text at a time. I am not sure that editing a PDF allows changing an object type (I am not even sure it is possible). Status still probably needs to be NEEDINFO to get developer input in to this, but if you could clarify what this report is actually about that would be great. Sorry for any confusion. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79721] writer slow on shapes, locks up if huge amount of shapes
https://bugs.freedesktop.org/show_bug.cgi?id=79721 --- Comment #25 from Lionel Elie Mamane lio...@mamane.lu --- Created attachment 103277 -- https://bugs.freedesktop.org/attachment.cgi?id=103277action=edit backtrace of seeming infinite loop Here's the backtrace after it seems to spin infinitely. It does not exit SwTabFrm::MakeAll for a long time; I assume that's where the ~infinite loop is. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79721] writer slow on shapes, locks up if huge amount of shapes
https://bugs.freedesktop.org/show_bug.cgi?id=79721 --- Comment #26 from Lionel Elie Mamane lio...@mamane.lu --- Created attachment 103278 -- https://bugs.freedesktop.org/attachment.cgi?id=103278action=edit LO 4.2-generated 174 entries odt. LibreOffice seemingly in infinite loop -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77460] Exporting to PDF from Presentation corrupts letter spacing with some fonts
https://bugs.freedesktop.org/show_bug.cgi?id=77460 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Attachment #97374|text/plain |application/vnd.oasis.opend mime type||ocument.presentation -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77460] Exporting to PDF from Presentation corrupts letter spacing with some fonts
https://bugs.freedesktop.org/show_bug.cgi?id=77460 --- Comment #1 from Owen Genat owen.ge...@gmail.com --- Created attachment 103279 -- https://bugs.freedesktop.org/attachment.cgi?id=103279action=edit PDF exported from MacOS1068+LOv4303. Appears to work fine here under MacOS 10.6.8 using v4.3.0.3 Build ID: fcd3838c4097f7817b5b3984fd88a44e1edd8548 (x86) but please check the attached as I have no reference to work against. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77460] Exporting to PDF from Presentation corrupts letter spacing with some fonts
https://bugs.freedesktop.org/show_bug.cgi?id=77460 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #2 from Owen Genat owen.ge...@gmail.com --- Status set to NEEDINFO. Please change the status back to UNCONFIRMED once the the provided attachment has been checked / a newer version of LO has been tested and the results reported back here. Thanks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81639] FORMATTING: Frame style position is not assignable to paragraph area
https://bugs.freedesktop.org/show_bug.cgi?id=81639 --- Comment #6 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- And does it work if, instead of right-clicking in an empty area in the stylist window, you right-click on an existing style to derive a new one from it? Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81639] FORMATTING: Frame style position is not assignable to paragraph area
https://bugs.freedesktop.org/show_bug.cgi?id=81639 --- Comment #7 from Martin Koeditz martin.koed...@it-syn.de --- Yes, this way it is working as I described in my workaround. So I don't see the difference between the automatic derived style and the manual assignment. Regards Martin -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79221] Border down and right don't have good view, but good export in PDF
https://bugs.freedesktop.org/show_bug.cgi?id=79221 Zolnai Tamás zolnaitamas2...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |zolnaitamas2...@gmail.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #43 from Dominik d0m1...@gmx.net --- i nominate https://bugs.freedesktop.org/show_bug.cgi?id=73678 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #44 from Dominik d0m1...@gmx.net --- nominating https://bugs.freedesktop.org/show_bug.cgi?id=75940 and https://bugs.freedesktop.org/show_bug.cgi?id=60428 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77972] UI: Better font selection in Japanese locale on Mac OSX.
https://bugs.freedesktop.org/show_bug.cgi?id=77972 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Owen Genat owen.ge...@gmail.com --- Seems like a reasonable request. Presumably the design / l10n teams will need to be consulted to determine how the change (if any) should be made. For clarity, the two entries in the referenced location mentioning Osaka are both in the ja locale entries: prop oor:name=UI_FIXED oor:type=xs:string oor:op=replace valueHG ゴシックB Sun;HG-GothicB Sun;HG Mincho Light J;ＭＳ Ｐゴシック;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic/value /prop prop oor:name=UI_SANS oor:type=xs:string oor:op=replace valueHG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;HG Mincho Light J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;Gothic;Gnu-Unifont/value /prop Status set to NEW. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #45 from Dominik d0m1...@gmx.net --- addendum: all three are regressions. first one covering lost conditional formatting’s, 2nd too and the third is about the duplex print setting which is ignored since about 4.0 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77997] Formula suggestion does not work for Add-In functions.
https://bugs.freedesktop.org/show_bug.cgi?id=77997 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Owen Genat owen.ge...@gmail.com --- Confirmed. Not sure how feasible this is but it seems like a reasonable request so it can't hurt to find out. Status set to NEW. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81641] Cancel style creation still creates a new style
https://bugs.freedesktop.org/show_bug.cgi?id=81641 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it Summary|Cancle style creation still |Cancel style creation still |creates a new style |creates a new style -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 79221, which changed state. Bug 79221 Summary: Border down and right don't have good view, but good export in PDF https://bugs.freedesktop.org/show_bug.cgi?id=79221 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81641] Cancel style creation still creates a new style
https://bugs.freedesktop.org/show_bug.cgi?id=81641 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEW Version|4.2.6.1 rc |4.2.5.2 release Ever confirmed|0 |1 --- Comment #1 from tommy27 ba...@quipo.it --- confirmed under WinXP 32bit using 4.2.5.2 we should retest against early 4.2.x and late 4.1.x release to see if it's a regression -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #46 from Dominik d0m1...@gmx.net --- further i nominate https://bugs.freedesktop.org/show_bug.cgi?id=70653 EDITING: impossible to change existing math catalog element's font face without its name auto-switched to Unicode value as it's a regression and exists since 3.4.6 and is even worse since #80650 , because it would provide a work-around. -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75116] VIEWING: Zoom level / UI scaling inconsistent
https://bugs.freedesktop.org/show_bug.cgi?id=75116 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Summary|VIEWING: Zoom level |VIEWING: Zoom level / UI |inconsistent|scaling inconsistent Ever confirmed|0 |1 --- Comment #6 from Owen Genat owen.ge...@gmail.com --- (In reply to comment #0) A zoom level of 80% is usually perfect for me to view the documents, but SOMETIMES when I start up LibreOffice Writer, all documents appear zoomed out about an additional 30 percent... EVEN THOUGH the zoom indicator is still set at 80%. This sounds like the setting under LibreOffice Preferences... LibreOffice View User Interface Scaling. The default is 100%. Next time you experience a change in scaling of the user interface, check this setting and report back. This scales the entire UI and not just the document view. Status set to NEEDINFO. Please change the status back to UNCONFIRMED once the request information is provided. Thanks. Summary edited for clarity. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76887] VIEWING: cant't filter on numeric fields in microsoft access databases
https://bugs.freedesktop.org/show_bug.cgi?id=76887 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||serval2...@yahoo.fr Ever confirmed|0 |1 --- Comment #2 from Julien Nabet serval2...@yahoo.fr --- On Win7 and LO 4.2.5, I can reproduce this. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76887] VIEWING: can't filter on numeric fields in microsoft access databases
https://bugs.freedesktop.org/show_bug.cgi?id=76887 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Summary|VIEWING: cant't filter on |VIEWING: can't filter on |numeric fields in microsoft |numeric fields in microsoft |access databases|access databases -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81604] pictures disappear
https://bugs.freedesktop.org/show_bug.cgi?id=81604 --- Comment #2 from stefan stefanschr...@yahoo.com --- Not sure how to submit an example: I see the pictures upon opening. They disappear while using the file. For non-disclosure reasons I cannot send the original file in unmodified version. I attach a file that I just created by copying a portion of the original file, which I opened with LibreOffice on MS OS and pasting it into a new odt file - don't think this will help. (the picture that disappeared is in a table - pictures disappear regardless if in table or directly in text) On Mon, 7/21/14, bugzilla-dae...@freedesktop.org bugzilla-dae...@freedesktop.org wrote: Subject: [Bug 81604] pictures disappear To: stefanschr...@yahoo.com Date: Monday, July 21, 2014, 9:09 AM Julien Nabet changed bug 81604 What Removed Added CC serval2...@yahoo.fr Comment # 1 on bug 81604 from Julien Nabet Could you attach a minimum example file so we can try to reproduce? (have in mind that any attachment is automatically made public, so remove any private/confidential part). You can use this link to attach a file + comment: https://bugs.freedesktop.org/attachment.cgi?bugid=81604action=enter You are receiving this mail because: You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81604] pictures disappear
https://bugs.freedesktop.org/show_bug.cgi?id=81604 --- Comment #3 from stefan stefanschr...@yahoo.com --- Created attachment 103281 -- https://bugs.freedesktop.org/attachment.cgi?id=103281action=edit odt file, pasted section of original document generated on Mac OS, used MS OS for performing this operation Not sure how to submit an example: I see the pictures upon opening. They disappear while using the file. For non-disclosure reasons I cannot send the original file in unmodified version. I attach a file that I just created by copying a portion of the original file, which I opened with LibreOffice on MS OS and pasting it into a new odt file - don't think this will help. (the picture that disappeared is in a table - pictures disappear regardless if in table or directly in text) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75175] UI: Options get cut off because window is too small
https://bugs.freedesktop.org/show_bug.cgi?id=75175 --- Comment #11 from Benny bennyba...@gmail.com --- (In reply to comment #10) (In reply to comment #9) I am not sur about themes. Is it a feature of LibreOffice or Linux Mint (Cinnamon in my case)? Both. You can change the icons set at system level and change the icons set used by LibreOffice (menu Tools Options LibreOffice View). I asked that because the checkboxes in your screencopies seems bigger as usual. Please, do not not answer by email, write on the webpage instead. Best regards. JBF I have now tsted some cases of icons, themes etc. see attached PDF file. I cannot get anything to change the look of the options Print dialog. Hops this info helps a little. Best regards BennyA -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 78160] No sound output whatsoever
https://bugs.freedesktop.org/show_bug.cgi?id=78160 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #2 from Owen Genat owen.ge...@gmail.com --- As per comment 1, status set to NEEDINFO. Please change the status back to UNCONFIRMED once the request information is provided. Thanks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75175] UI: Options get cut off because window is too small
https://bugs.freedesktop.org/show_bug.cgi?id=75175 --- Comment #12 from Benny bennyba...@gmail.com --- Created attachment 103282 -- https://bugs.freedesktop.org/attachment.cgi?id=103282action=edit Testing of themes, icons etc to see if anything changes. I have tested more Libreoffice settings, then some Linux Mint system settings, themes, icons sets etc. Nothing of this removes the problem in LO. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
