[Libreoffice-commits] core.git: 3 commits - oox/Library_oox.mk oox/source writerfilter/source
oox/Library_oox.mk|1
oox/source/shape/ShapeContextHandler.cxx | 38
oox/source/shape/ShapeContextHandler.hxx |2
oox/source/shape/WpgContext.cxx | 59 ++
oox/source/shape/WpgContext.hxx | 38
oox/source/token/namespaces.hxx.tail |1
oox/source/token/namespaces.txt |1
oox/source/token/tokens.txt |1
writerfilter/source/dmapper/GraphicImport.cxx |1
writerfilter/source/ooxml/model.xml | 23 ++
10 files changed, 164 insertions(+), 1 deletion(-)
New commits:
commit ec746c830c4ce86e446b929a88a3376a51871314
Author: Miklos Vajna
Date: Wed Nov 27 11:40:46 2013 +0100
oox: initial import of wpg:wgp
We import something that's visible, but the position of the shape is not
correct yet.
Change-Id: Ie68f0ebad1cc992a6c8d7704d7262f7e983f3b19
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 7bd3710..b7e763c 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -277,6 +277,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/shape/ShapeContextHandler \
oox/source/shape/ShapeDrawingFragmentHandler \
oox/source/shape/ShapeFilterBase \
+oox/source/shape/WpgContext \
oox/source/shape/WpsContext \
oox/source/token/namespacemap \
oox/source/token/propertynames \
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index bcf43c8..c12518d 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -23,6 +23,7 @@
#include "ShapeDrawingFragmentHandler.hxx"
#include "LockedCanvasContext.hxx"
#include "WpsContext.hxx"
+#include "WpgContext.hxx"
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/drawingml/themefragmenthandler.hxx"
@@ -136,6 +137,26 @@ uno::Reference
ShapeContextHandler::getWpsContext
return mxWpsContext;
}
+uno::Reference
ShapeContextHandler::getWpgContext(sal_Int32 nElement)
+{
+if (!mxWpgContext.is())
+{
+FragmentHandler2Ref rFragmentHandler(new
ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+ShapePtr pMasterShape;
+
+switch (getBaseToken(nElement))
+{
+case XML_wgp:
+mxWpgContext.set(new WpgContext(*rFragmentHandler));
+break;
+default:
+break;
+}
+}
+
+return mxWpgContext;
+}
+
uno::Reference
ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element )
{
@@ -216,6 +237,9 @@ ShapeContextHandler::getContextHandler()
case NMSP_wps:
xResult.set(getWpsContext(mnStartToken));
break;
+case NMSP_wpg:
+xResult.set(getWpgContext(mnStartToken));
+break;
default:
xResult.set(getGraphicShapeContext(mnStartToken));
break;
@@ -240,7 +264,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
mpThemePtr.reset(new Theme());
-if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) ||
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp))
+if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) ||
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp) || Element ==
WPG_TOKEN(wgp))
{
// Parse the theme relation, if available; the diagram won't have
colors without it.
if (!msRelationFragmentPath.isEmpty())
@@ -432,6 +456,18 @@ ShapeContextHandler::getShape() throw
(uno::RuntimeException)
mxWpsContext.clear();
}
}
+else if (mxWpgContext.is())
+{
+ShapePtr pShape =
dynamic_cast(mxWpgContext.get())->getShape();
+if (pShape)
+{
+basegfx::B2DHomMatrix aMatrix;
+pShape->setPosition(maPosition);
+pShape->addShape(*mxFilterBase, mpThemePtr.get(), xShapes,
aMatrix, pShape->getFillProperties());
+xResult = pShape->getXShape();
+mxWpgContext.clear();
+}
+}
else if (mpShape.get() != NULL)
{
basegfx::B2DHomMatrix aTransformation;
diff --git a/oox/source/shape/ShapeContextHandler.hxx
b/oox/source/shape/ShapeContextHandler.hxx
index 0c21313..7a9b93c 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -155,6 +155,7 @@ private:
css::uno::Reference mxDiagramShapeContext;
css::uno::Reference mxLockedCanvasContext;
css::uno::Reference mxWpsContext;
+css::uno::Reference mxWpgContext;
css::uno::Reference mxChartShapeContext;
core::XmlFilterRef mxFilterBase;
@@ -169,6 +170,7 @@ private:
css::uno::Reference getDiagramShapeContext();
css::uno::Reference getLockedCanvasCon
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/layout/wsfrm.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit b1a660f9298f00cb97b51d77e896abece4767562 Author: Pavel JanÃk Date: Wed Nov 27 11:10:10 2013 + WaE: reorder initializations properly to prevent compiler warnings. diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 7b5f684..302ccf7 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -88,6 +88,10 @@ using namespace ::com::sun::star; SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : SwClient( pMod ), +//IAccessibility2 Implementation 2009- +//Solution:Add a member to identify if the acc table should dispose +bIfAccTableShouldDisposing( sal_False ), +//-IAccessibility2 Implementation 2009 // --> OD 2006-05-10 #i65250# mnFrmId( SwFrm::mnLastFrmId++ ), // <-- @@ -96,10 +100,6 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : pNext( 0 ), pPrev( 0 ), pDrawObjs( 0 ) -//IAccessibility2 Implementation 2009- -//Solution:Add a member to identify if the acc table should dispose -, bIfAccTableShouldDisposing( sal_False ) -//-IAccessibility2 Implementation 2009 , bInfBody( sal_False ) , bInfTab ( sal_False ) , bInfFly ( sal_False ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 06:34:59PM +0700, Robert M Campbell wrote: > On Wed, Nov 27, 2013 at 5:25 PM, Khaled Hosny wrote: > > > On Wed, Nov 27, 2013 at 10:10:26AM +0100, Samuel Mehrbrodt wrote: > > > Hi Robert, > > > > > > I think there is no formal process when to include a new font. If it > > makes > > > sense, it's ok. Fonts are not that big. > > > > Fonts CAN be that big :) Look at TeX Live, of its 3.5 GB install, 1.4 GB > > are fonts. > > > > My hope is to not add more than a few KB per font, if at all possible. Font > language support shouldn't be 'include 9 million glyphs of various artistic > types and what-not'. We just need basic support for Thai, Khmer, and Lao, > so the simpler / smaller, the better. If they want some other font, they > should install it IMHO. Hopefully, someday, there'll be a nice all language > font that isn't too big. Until then... > > Another Q - where exactly am I patching? When I helped with the ICU update, > a archive was added to the web server and the download.list was used. In > that case, the only patch would be for the download.list. Or, should we > have a font contribution subfolder/submodule that contains each font in the > master that contains all of the embedded fonts? That way in review process, > people can look at the font and determine if it's a good idea to add and is > open and etc... Check external/more_fonts/* Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Vendors Name via UNO API / Basic Macros
On 11/26/2013 01:56 PM, Lionel Elie Mamane wrote: On Thu, Nov 21, 2013 at 08:34:04PM +0100, Jan Holesovsky wrote: Thomas Krumbein píše v Pá 15. 11. 2013 v 15:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. Have you filed a bugreport, please? A minimal example of the macro that fails would be most appreciated. Well - it´s not a bug, because you mentioned the change in release-notes of version 4.1. There are many ways how to make the problem less annoying in Basic ;-) - we control the Basic implementation, so can work around many things, and if we are lucky, this will be one of them. I am sure we'd try to do that before the release with the incompatible change if we knew early. Well, I considered doing some "magic" that when the property is written, if it gets an integer, interpret it the old way and if it gets a UNO Date struct, interpret it the obvious (new) way. Someone (Stephan Bergmann?) told me that one could do that for attributes but not (pseudo?)properties (or something like that); the Basic implementation (bridge?) would refuse to even pass a value of the wrong type to the C++ code. I don't see how to achieve it short of special-casing this into the bridge / other parts of the Basic implementation. Which sounds like a guaranteed subscription for maintenance nightmares, and thus not the best of ideas. Would the Basic implementation / UNO bridge people be willing to actually have that kind of special-casing? Not sure what you mean with the sentence about attributes and properties. But the Basic implementation would indeed be the place where to handle such special cases to improve backwards compatibility. (Which matches the observation that Basic authors and Basic code, which often comes included in documents, probably have the hardest time copying with our deliberate incompatibilities.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 5:25 PM, Khaled Hosny wrote: > On Wed, Nov 27, 2013 at 10:10:26AM +0100, Samuel Mehrbrodt wrote: > > Hi Robert, > > > > I think there is no formal process when to include a new font. If it > makes > > sense, it's ok. Fonts are not that big. > > Fonts CAN be that big :) Look at TeX Live, of its 3.5 GB install, 1.4 GB > are fonts. > My hope is to not add more than a few KB per font, if at all possible. Font language support shouldn't be 'include 9 million glyphs of various artistic types and what-not'. We just need basic support for Thai, Khmer, and Lao, so the simpler / smaller, the better. If they want some other font, they should install it IMHO. Hopefully, someday, there'll be a nice all language font that isn't too big. Until then... Another Q - where exactly am I patching? When I helped with the ICU update, a archive was added to the web server and the download.list was used. In that case, the only patch would be for the download.list. Or, should we have a font contribution subfolder/submodule that contains each font in the master that contains all of the embedded fonts? That way in review process, people can look at the font and determine if it's a good idea to add and is open and etc... -Robert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fix sort order of Dockes
On 11/26/2013 06:58 PM, Tae Wong wrote: In the D section of Development/Developers, there are sort errors: Sameer comes after Rohit: Desai, Karan Deshmukh, Sameer Deshmukh, Rohit Dywan comes before Dockes. Mládek's last name should have a diacritic: Mládek, Petr. It's a wiki after all, so feel free to directly fix obvious bugs like the above yourself. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/source/ui/app/app.src|4 -
sw/source/ui/dochdl/swdtflvr.cxx|2
sw/source/ui/inc/app.hrc|1
sw/source/ui/uiview/view2.cxx |2
sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui | 34
6 files changed, 37 insertions(+), 7 deletions(-)
New commits:
commit b5fced896632a3c07586702b461545667b33966e
Author: Manal Alhassoun
Date: Wed Nov 27 13:33:09 2013 +0300
convert Rotate into standard orientation querybox to .ui
Change-Id: Id85362c0930a4156e569bd4c6b13aa94213f09c7
Reviewed-on: https://gerrit.libreoffice.org/6826
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 5b3a755..441cc43 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/querycontinuebegindialog \
sw/uiconfig/swriter/ui/querycontinueenddialog \
sw/uiconfig/swriter/ui/querydefaultcompatdialog \
+ sw/uiconfig/swriter/ui/queryrotateintostandarddialog \
sw/uiconfig/swriter/ui/querysavelabeldialog \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/mmcreatingdialog \
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index bc8cd0e..a7863ce 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -708,10 +708,6 @@ ToolBox RID_MODULE_TOOLBOX
Scroll = TRUE ;
};
-String STR_ROTATE_TO_STANDARD_ORIENTATION
-{
-Text [ en-US ] = "This image is rotated. Would you like to rotate it into
standard orientation?";
-};
String STR_CAPTION_TABLE
{
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 045cf6c..98e9d1d 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -381,7 +381,7 @@ namespace
sal_uInt16 aRotation = aMetadata.getRotation();
if (aRotation != 0)
{
-QueryBox aQueryBox(0, WB_YES_NO | WB_DEF_YES,
SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) );
+MessageDialog aQueryBox(
0,"QueryRotateIntoStandardOrientationDialog","modules/swriter/ui/queryrotateintostandarddialog.ui");
if (aQueryBox.Execute() == RET_YES)
{
GraphicNativeTransform aTransform( aGraphic );
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 3734788..c5ac3f5 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -101,7 +101,6 @@
#define STR_SIMPLE (RC_APP_BEGIN + 129)
#define STR_AUTHMRK_EDIT(RC_APP_BEGIN + 130)
#define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131)
-#define STR_ROTATE_TO_STANDARD_ORIENTATION (RC_APP_BEGIN + 132)
#define STR_CAPTION_TABLE (RC_APP_BEGIN + 133)
#define STR_CAPTION_FRAME (RC_APP_BEGIN + 134)
#define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135)
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 7c9aa10..9c04f53 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -225,7 +225,7 @@ int SwView::InsertGraphic( const OUString &rPath, const
OUString &rFilter,
sal_uInt16 aRotation = aMetadata.getRotation();
if (aRotation != 0)
{
-QueryBox aQueryBox(GetWindow(), WB_YES_NO | WB_DEF_YES,
SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) );
+MessageDialog aQueryBox(
GetWindow(),"QueryRotateIntoStandardOrientationDialog","modules/swriter/ui/queryrotateintostandarddialog.ui");
if (aQueryBox.Execute() == RET_YES)
{
GraphicNativeTransform aTransform( aGraphic );
diff --git a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
new file mode 100644
index 000..b50cdd9
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
@@ -0,0 +1,34 @@
+
+
+
+
+False
+12
+Rotate into standard
orientation?
+False
+dialog
+True
+question
+yes-no
+This image is rotated. Would you
like to rotate it into standard orientation?
+
+
+False
+vertical
+24
+
+
+False
+center
+
+
+False
+True
+end
+0
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 422e84ecbc6c13c07d8da1c05c085bd3d83f69bc Author: Caolán McNamara Date: Wed Nov 27 11:20:04 2013 + Updated core Project: translations eaf5194e57a9a6b82672a019c8db30c9a67ff21a diff --git a/translations b/translations index c8c4037..eaf5194 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit c8c40371caa4507a490f8c5ab0961a35848d01c5 +Subproject commit eaf5194e57a9a6b82672a019c8db30c9a67ff21a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/it
source/it/officecfg/registry/data/org/openoffice/Office/UI.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eaf5194e57a9a6b82672a019c8db30c9a67ff21a Author: Caolán McNamara Date: Wed Nov 27 11:20:04 2013 + Resolves: rhbz#1035092 no shortcut key for Italian 'Tools' menu Change-Id: I2f8867e7d4b9c7884d1d3af4f34a93fa5da08b47 diff --git a/source/it/officecfg/registry/data/org/openoffice/Office/UI.po b/source/it/officecfg/registry/data/org/openoffice/Office/UI.po index ea1ff2f..97dc332 100644 --- a/source/it/officecfg/registry/data/org/openoffice/Office/UI.po +++ b/source/it/officecfg/registry/data/org/openoffice/Office/UI.po @@ -18673,7 +18673,7 @@ msgctxt "" "Label\n" "value.text" msgid "~Tools" -msgstr "Strumenti" +msgstr "~Strumenti" #: GenericCommands.xcu msgctxt "" ___ 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' - basegfx/source cppcanvas/source include/basegfx
basegfx/source/polygon/b2dlinegeometry.cxx |7 +-
cppcanvas/source/inc/implrenderer.hxx |3 -
cppcanvas/source/mtfrenderer/emfplus.cxx| 75
include/basegfx/polygon/b2dlinegeometry.hxx |7 ++
4 files changed, 55 insertions(+), 37 deletions(-)
New commits:
commit f305861b1be589ff6854be2f72541398b61c637b
Author: Jan Holesovsky
Date: Wed Nov 27 11:51:32 2013 +0100
EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 5c016bb..417944d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -44,7 +44,8 @@ namespace basegfx
double fWidth,
double fCandidateLength,
double fDockingPosition, // 0->top, 1->bottom
-double* pConsumedLength)
+double* pConsumedLength,
+double fShift)
{
B2DPolyPolygon aRetval;
OSL_ENSURE(rCandidate.count() > 1L,
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
@@ -89,7 +90,7 @@ namespace basegfx
const double
fArrowYLength(B2DVector(aUpperCenter).getLength());
// move arrow to have docking position centered
-aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition);
+aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition + fShift);
// prepare polygon length
if(fTools::equalZero(fCandidateLength))
@@ -98,7 +99,7 @@ namespace basegfx
}
// get the polygon vector we want to plant this arrow on
-const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition));
+const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L :
rCandidate.count() - 1L));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c649db3..3d0c48d 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -282,7 +282,8 @@ static float GetSwapFloat( SvStream& rSt )
double setFont( sal_uInt8 objectId, const ActionFactoryParameters&
rParms, OutDevState& rState );
/// Render LineCap, like the start or end arrow of a polygon.
-void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon,
double fPolyLength,
+/// @return how much we should shorten the original polygon.
+double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon,
double fPolyLength,
const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart,
const com::sun::star::rendering::StrokeAttributes&
rAttributes,
const ActionFactoryParameters& rParms, OutDevState&
rState);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4907b6f..e7fa984 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1319,13 +1319,12 @@ namespace cppcanvas
}
}
-
-void ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon&
rPolygon, double fPolyLength,
+double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon&
rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, const
rendering::StrokeAttributes& rAttributes,
const ActionFactoryParameters& rParms, OutDevState& rState)
{
if (!rLineCap.count())
-return;
+return 0.0;
// it seems the line caps in EMF+ are 4*larger than what
// LibreOffice expects, and the mapping in
@@ -1337,7 +1336,7 @@ namespace cppcanvas
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0.0, NULL));
+fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
@@ -1349,6 +1348,8 @@ namespace cppcanvas
maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
rParms.mrCurrActionIndex += pAction->getActionCount()-1;
}
+
+return rAttributes.StrokeWidth;
}
void ImplRenderer::EMFPPlusDrawPol
[Libreoffice-commits] core.git: basegfx/source cppcanvas/source include/basegfx
basegfx/source/polygon/b2dlinegeometry.cxx |7 +-
cppcanvas/source/inc/implrenderer.hxx |3 -
cppcanvas/source/mtfrenderer/emfplus.cxx| 75
include/basegfx/polygon/b2dlinegeometry.hxx |7 ++
4 files changed, 55 insertions(+), 37 deletions(-)
New commits:
commit acd5edd3d4ee77387b9e437dc1368da080c40c03
Author: Jan Holesovsky
Date: Wed Nov 27 11:51:32 2013 +0100
EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 5c016bb..417944d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -44,7 +44,8 @@ namespace basegfx
double fWidth,
double fCandidateLength,
double fDockingPosition, // 0->top, 1->bottom
-double* pConsumedLength)
+double* pConsumedLength,
+double fShift)
{
B2DPolyPolygon aRetval;
OSL_ENSURE(rCandidate.count() > 1L,
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
@@ -89,7 +90,7 @@ namespace basegfx
const double
fArrowYLength(B2DVector(aUpperCenter).getLength());
// move arrow to have docking position centered
-aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition);
+aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition + fShift);
// prepare polygon length
if(fTools::equalZero(fCandidateLength))
@@ -98,7 +99,7 @@ namespace basegfx
}
// get the polygon vector we want to plant this arrow on
-const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition));
+const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L :
rCandidate.count() - 1L));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c649db3..3d0c48d 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -282,7 +282,8 @@ static float GetSwapFloat( SvStream& rSt )
double setFont( sal_uInt8 objectId, const ActionFactoryParameters&
rParms, OutDevState& rState );
/// Render LineCap, like the start or end arrow of a polygon.
-void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon,
double fPolyLength,
+/// @return how much we should shorten the original polygon.
+double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon,
double fPolyLength,
const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart,
const com::sun::star::rendering::StrokeAttributes&
rAttributes,
const ActionFactoryParameters& rParms, OutDevState&
rState);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f3f6b50..4172649 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1317,13 +1317,12 @@ namespace cppcanvas
}
}
-
-void ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon&
rPolygon, double fPolyLength,
+double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon&
rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, const
rendering::StrokeAttributes& rAttributes,
const ActionFactoryParameters& rParms, OutDevState& rState)
{
if (!rLineCap.count())
-return;
+return 0.0;
// it seems the line caps in EMF+ are 4*larger than what
// LibreOffice expects, and the mapping in
@@ -1335,7 +1334,7 @@ namespace cppcanvas
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0.0, NULL));
+fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
@@ -1347,6 +1346,8 @@ namespace cppcanvas
maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
rParms.mrCurrActionIndex += pAction->getActionCount()-1;
}
+
+return rAttributes.StrokeWidth;
}
void ImplRenderer::EMFPPlusDrawPol
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9b/bfae5c7597ec24c04e3becb32ee73b230c549f
9b/bfae5c7597ec24c04e3becb32ee73b230c549f |1 + 1 file changed, 1 insertion(+) New commits: commit de0ed17f4cc6a2b35413107bdc4002b729522559 Author: Caolán McNamara Date: Wed Nov 27 10:44:50 2013 + Notes added by 'git notes add' diff --git a/9b/bfae5c7597ec24c04e3becb32ee73b230c549f b/9b/bfae5c7597ec24c04e3becb32ee73b230c549f new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/9b/bfae5c7597ec24c04e3becb32ee73b230c549f @@ -0,0 +1 @@ +ignore: aoo ___ 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/schart/01/0402.xhp | 18 +- 2 files changed, 9 insertions(+), 11 deletions(-) New commits: commit 1a08f80034749e9f2d8fc94497e3d0cd528afe70 Author: Caolán McNamara Date: Wed Nov 27 10:42:38 2013 + update helpids for legend tabpage .ui conversion Change-Id: If98262d2275054ee81c15ccb81838bc2f0da53e2 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 576d761..5fa995c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3030,7 +3030,6 @@ HID_SCH_DATA_RANGES_LIST,63296, HID_SCH_DATA_SERIES_LABEL,63367, HID_SCH_DLG_RANGES,63327, HID_SCH_LB_BAR_GEOMETRY,63325, -HID_SCH_LEGEND_POS,63285, HID_SCH_LEGEND_POS_BOTTOM,63343, HID_SCH_LEGEND_POS_LEFT,63340, HID_SCH_LEGEND_POS_RIGHT,63342, @@ -5665,7 +5664,6 @@ chart2_ListBox_TP_3D_SCENEAPPEARANCE_LB_SCHEME,551882242, chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_AMBIENTLIGHT,551898625, chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_LIGHTSOURCE,551898626, chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937, -chart2_ListBox_TP_LEGEND_POS_LB_LEGEND_TEXTDIR,551620100, chart2_ListBox_TP_LOCATION_LB_TABLE,551833089, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_PERSPECTIVE,551868932, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_X_ROTATION,551868929, diff --git a/source/text/schart/01/0402.xhp b/source/text/schart/01/0402.xhp index 4ab2297..5118331 100644 --- a/source/text/schart/01/0402.xhp +++ b/source/text/schart/01/0402.xhp @@ -61,28 +61,28 @@ Position Select the position for the legend: - + Left -Positions the legend at the left of the chart. +Positions the legend at the left of the chart. - + Top -Positions the legend at the top of the chart. +Positions the legend at the top of the chart. - + Right -Positions the legend at the right of the chart. +Positions the legend at the right of the chart. - + Bottom -Positions the legend at the bottom of the chart. +Positions the legend at the bottom of the chart. Text Orientation This feature is only available if complex text layout support is enabled in %PRODUCTNAME - PreferencesTools - Options - Language settings - Languages. - + Text Direction Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source helpcontent2
chart2/source/controller/inc/HelpIds.hrc |1 - helpcontent2 |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit b5c2e38a71099a724b34697c38c64e870fe2061f Author: Caolán McNamara Date: Wed Nov 27 10:36:21 2013 + drop unused HID_SCH_LEGEND_POS helpid Change-Id: I520951b21dd017c0d8a21f455f9abaa18e329e68 diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 6370905..f2b7c1f 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -19,7 +19,6 @@ #ifndef CHART_HELPIDS_HRC #define CHART_HELPIDS_HRC -#define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS" #define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR" #define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT" commit 34daf67f27c02fcd6d9a90c39a7a8c0d3e30e8ee Author: Caolán McNamara Date: Wed Nov 27 10:42:38 2013 + Updated core Project: help 1a08f80034749e9f2d8fc94497e3d0cd528afe70 diff --git a/helpcontent2 b/helpcontent2 index b0dd802..1a08f80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b0dd80238089dfcc0b3bf7bed99564adce649397 +Subproject commit 1a08f80034749e9f2d8fc94497e3d0cd528afe70 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basctl/source include/svtools qadevOOo/tests svtools/source
basctl/source/basicide/baside2b.cxx |2
include/svtools/textwindowpeer.hxx | 43 ++--
qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java |5
svtools/source/edit/textwindowpeer.cxx | 64
4 files changed, 59 insertions(+), 55 deletions(-)
New commits:
commit 0ee2cddfbd9cc710371048df560e397d6881d69b
Author: Stephan Bergmann
Date: Wed Nov 27 11:35:17 2013 +0100
Properly encapsulate svt::TextWindowPeer
Change-Id: Iffa67c345a03852ad7872031b4c5a87e223ffcad
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 76b717f..fee2d61 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2102,7 +2102,7 @@ EditorWindow::GetComponentInterface(sal_Bool bCreate)
if (!pEditEngine)
CreateEditEngine();
-xPeer = new ::svt::TextWindowPeer(*GetEditView());
+xPeer = svt::createTextWindowPeer(*GetEditView());
SetComponentInterface(xPeer);
}
return xPeer;
diff --git a/include/svtools/textwindowpeer.hxx
b/include/svtools/textwindowpeer.hxx
index 14ef753..7da6b83 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
@@ -20,45 +20,24 @@
#ifndef INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
#define INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
-#include
-#include
+#include
-#include
+#include
+#include
+#include
-class TextEngine;
+namespace com { namespace sun { namespace star { namespace awt {
+class XWindowPeer;
+} } } }
class TextView;
-namespace svt
-{
-class AccessibleFactoryAccess ;
-
-class TextWindowPeer: public ::VCLXWindow
-{
-public:
-SVT_DLLPUBLIC TextWindowPeer(::TextView & rView);
-
-virtual ~TextWindowPeer();
-
-private:
-// VCLXWindow inherits funny copy constructor and assignment operator from
-// ::cppu::OWeakObject, so override them here:
-
-TextWindowPeer(TextWindowPeer &); // not implemented
-
-void operator =(TextWindowPeer); // not implemented
-
-virtual ::com::sun::star::uno::Reference<
-::com::sun::star::accessibility::XAccessibleContext >
-CreateAccessibleContext();
-
-::TextEngine & m_rEngine;
-::TextView & m_rView;
+namespace svt {
-::std::auto_ptr< ::svt::AccessibleFactoryAccess > m_pFactoryAccess;
-};
+css::uno::Reference SVT_DLLPUBLIC createTextWindowPeer(
+TextView & view);
}
-#endif // INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/edit/textwindowpeer.cxx
b/svtools/source/edit/textwindowpeer.cxx
index 11fa8c9..6e0a8b7 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -17,31 +17,55 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
#include
+#include
+#include
#include
-#include "svtaccessiblefactory.hxx"
-namespace svt
+namespace {
+
+class TextWindowPeer: public VCLXWindow, private boost::noncopyable {
+public:
+explicit TextWindowPeer(TextView & view);
+
+virtual ~TextWindowPeer() {}
+
+private:
+virtual css::uno::Reference
+CreateAccessibleContext();
+
+TextEngine & m_rEngine;
+TextView & m_rView;
+svt::AccessibleFactoryAccess m_aFactoryAccess;
+};
+
+TextWindowPeer::TextWindowPeer(TextView & view):
+m_rEngine(*view.GetTextEngine()), m_rView(view)
+{
+SetWindow(view.GetWindow());
+}
+
+css::uno::Reference
+TextWindowPeer::CreateAccessibleContext() {
+return m_aFactoryAccess.getFactory().createAccessibleTextWindowContext(
+this, m_rEngine, m_rView);
+}
+
+}
+
+css::uno::Reference svt::createTextWindowPeer(
+TextView & view)
{
-TextWindowPeer::TextWindowPeer(::TextView & rView):
-m_rEngine(*rView.GetTextEngine()), m_rView(rView)
-{
-SetWindow(rView.GetWindow());
-m_pFactoryAccess.reset( new AccessibleFactoryAccess );
-}
-
-// virtual
-TextWindowPeer::~TextWindowPeer()
-{
-}
-
-css::uno::Reference< css::accessibility::XAccessibleContext >
TextWindowPeer::CreateAccessibleContext()
-{
-return
m_pFactoryAccess->getFactory().createAccessibleTextWindowContext(
-this, m_rEngine, m_rView
-);
-}
+return new TextWindowPeer(view);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 758abf0130d5bc38507c31c2eb5d414a4a27b53b
Author: Stephan Bergmann
Date: Wed Nov 27 11:33:40 2013 +0100
Improve test output
Change-Id: I33b289a31a9a4991eb270b3d154d999fa76c7bb4
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index 50a803f..63eb4c5 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/dialogs/dlg_InsertLegend.cxx |2
chart2/source/controller/dialogs/res_LegendPosition.cxx | 247
+-
chart2/source/controller/dialogs/res_LegendPosition.hxx | 52 +-
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 13
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 10
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |4
chart2/source/controller/inc/dlg_InsertLegend.hxx |4
chart2/uiconfig/ui/tp_LegendPosition.ui | 78 ++-
9 files changed, 363 insertions(+), 49 deletions(-)
New commits:
commit 07a58db41301d15523519b99d2c64f1885909cda
Author: Caolán McNamara
Date: Wed Nov 27 10:31:37 2013 +
provide two LegendPositionResources for the interim
LegendPositionResources for .ui based stuff and a legacy
oldLegendPositionResources which can be phased out when
the last .res based user is gone
Change-Id: I02478882e0cb54ee0fe5c2c5d15382f94758a3d2
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index e291771..c8513d2 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference<
uno::XComponentContext>& xCC )
: ModalDialog(pWindow, SchResId(DLG_LEGEND))
-, m_apLegendPositionResources( new LegendPositionResources(this,xCC) )
+, m_apLegendPositionResources( new oldLegendPositionResources(this,xCC) )
, aBtnOK(this, SchResId(BTN_OK))
, aBtnCancel(this, SchResId(BTN_CANCEL))
, aBtnHelp(this, SchResId(BTN_HELP))
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3f0b459..fe7d3df 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -42,7 +42,219 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-LegendPositionResources::LegendPositionResources( Window* pWindow )
+LegendPositionResources::LegendPositionResources(VclBuilderContainer& rParent)
+: m_xCC() //unused in this scenario
+, m_pCbxShow( NULL ) //unused in this scenario, assumed to be visible
+{
+rParent.get(m_pRbtLeft, "left");
+rParent.get(m_pRbtRight, "right");
+rParent.get(m_pRbtTop, "top");
+rParent.get(m_pRbtBottom, "bottom");
+impl_setRadioButtonToggleHdl();
+}
+
+LegendPositionResources::LegendPositionResources(VclBuilderContainer& rParent,
+const uno::Reference< uno::XComponentContext >& xCC)
+: m_xCC(xCC)
+{
+rParent.get(m_pCbxShow, "show");
+rParent.get(m_pRbtLeft, "left");
+rParent.get(m_pRbtRight, "right");
+rParent.get(m_pRbtTop, "top");
+rParent.get(m_pRbtBottom, "bottom");
+
+m_pCbxShow->SetToggleHdl( LINK( this, LegendPositionResources,
PositionEnableHdl ) );
+impl_setRadioButtonToggleHdl();
+}
+
+void LegendPositionResources::impl_setRadioButtonToggleHdl()
+{
+m_pRbtLeft->SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+m_pRbtTop->SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+m_pRbtRight->SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+m_pRbtBottom->SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+}
+
+LegendPositionResources::~LegendPositionResources()
+{
+}
+
+void LegendPositionResources::writeToResources( const uno::Reference<
frame::XModel >& xChartModel )
+{
+try
+{
+uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(
xChartModel );
+uno::Reference< beans::XPropertySet > xProp( xDiagram->getLegend(),
uno::UNO_QUERY );
+if( xProp.is() )
+{
+//show
+sal_Bool bShowLegend = sal_False;
+xProp->getPropertyValue( "Show" ) >>= bShowLegend;
+if (m_pCbxShow)
+m_pCbxShow->Check( bShowLegend );
+PositionEnableHdl(0);
+
+//position
+chart2::LegendPosition ePos;
+xProp->getPropertyValue( "AnchorPosition" ) >>= ePos;
+switch( ePos )
+{
+case chart2::LegendPosition_LINE_START:
+m_pRbtLeft->Check();
+break;
+case chart2::LegendPosition_LINE_END:
+m_pRbtRight->Check();
+break;
+case chart2::LegendPosition_PAGE_START:
+m_pRbtTop->Check();
+break;
+case chart2::LegendPosition_PAGE_END:
+m_pRbtBottom->Check();
[Libreoffice-commits] core.git: editeng/source
editeng/source/accessibility/AccessibleEditableTextPara.cxx |9 + 1 file changed, 1 insertion(+), 8 deletions(-) New commits: commit 4f94f16ba15218e5e7a9eb4d72ddb4cb62884dbb Author: Stephan Bergmann Date: Wed Nov 27 11:28:57 2013 +0100 IAccessible2: revert some bounds-checking changes again ...that were introduced with c23ab5eaed57cc3fb5860e26c591c73c5b22687b "Integrate branch of IAccessible2" but broke JunitTest_sc_unoapi, which expects calls to getCharacterAttributes and getIndexAtPoint to actually fail for out-of-bounds arguments. The above commit does not make it obvious why those changes were actually made. Change-Id: I3492c3e6a49d68885df1206e9368f4483c0dc4f9 diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index e9941df..614294f 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -1381,11 +1381,7 @@ namespace accessibility EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) ); if (aBulletInfo.bVisible) nIndex += aBulletInfo.aText.getLength(); -if (nIndex != 0 && nIndex >= getCharacterCount()) -nIndex = getCharacterCount()-1; -// -if (nIndex != 0) -CheckIndex(nIndex); // may throw IndexOutOfBoundsException +CheckIndex(nIndex); // may throw IndexOutOfBoundsException bool bSupplementalMode = false; uno::Sequence< OUString > aPropertyNames = rRequestedAttributes; @@ -1534,9 +1530,6 @@ namespace accessibility SolarMutexGuard aGuard; -if ((rPoint.X <= 0) && (rPoint.Y <= 0)) -return 0; - sal_Int32 nPara; sal_uInt16 nIndex; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/TabPages.hrc |4
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 35 ++---
chart2/source/controller/dialogs/tp_LegendPosition.hxx |9 -
chart2/source/controller/dialogs/tp_LegendPosition.src | 64 -
chart2/uiconfig/ui/tp_LegendPosition.ui| 118 +
7 files changed, 141 insertions(+), 91 deletions(-)
New commits:
commit e5ad76c11ff6dc3e349c8a73628269c4a9dc3302
Author: Olivier Hallot
Date: Tue Nov 26 23:14:18 2013 -0200
Convert chart legend position tabpage to widget UI
Change-Id: Iefdbbff83ea05c2e926191a2058a0be67c281789
Reviewed-on: https://gerrit.libreoffice.org/6824
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index 907e238..fbe346a 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/tp_DataLabel.src \
chart2/source/controller/dialogs/tp_DataSource.src \
chart2/source/controller/dialogs/tp_ErrorBars.src \
-chart2/source/controller/dialogs/tp_LegendPosition.src \
chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/dialogs/tp_PolarOptions.src \
chart2/source/controller/dialogs/tp_RangeChooser.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index fa584e2..9635e96 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/titlerotationtabpage \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_AxisPositions \
+ chart2/uiconfig/ui/tp_LegendPosition \
chart2/uiconfig/ui/tp_SeriesToAxis \
chart2/uiconfig/ui/tp_Scale \
chart2/uiconfig/ui/tp_Trendline \
diff --git a/chart2/source/controller/dialogs/TabPages.hrc
b/chart2/source/controller/dialogs/TabPages.hrc
index f746edc..64a9602 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -25,10 +25,6 @@
//see attrib.hrc in old chart
-#define GRP_LEGEND 1
-#define FL_LEGEND_TEXTORIENT2
-#define FT_LEGEND_TEXTDIR 3
-#define LB_LEGEND_TEXTDIR 4
//Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
// ID's for title rotation tabpage
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 0de7587..6f30aeb 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -29,46 +29,47 @@
namespace chart
{
-SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow,
- const SfxItemSet& rInAttrs)
-: SfxTabPage( pWindow, SchResId(TP_LEGEND_POS), rInAttrs )
-, aGrpLegend( this, SchResId(GRP_LEGEND) )
-, m_apLegendPositionResources( new LegendPositionResources(this) )
-, m_aFlTextOrient( this, SchResId( FL_LEGEND_TEXTORIENT ) )
-, m_aFtTextDirection( this, SchResId( FT_LEGEND_TEXTDIR ) )
-, m_aLbTextDirection( this, SchResId( LB_LEGEND_TEXTDIR ),
&m_aFlTextOrient, &m_aFtTextDirection )
+SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet&
rInAttrs)
+: SfxTabPage( pWindow
+ ,"tp_LegendPosition"
+ ,"modules/schart/ui/tp_LegendPosition.ui"
+ , rInAttrs )
{
-m_apLegendPositionResources->SetAccessibleRelationMemberOf(&aGrpLegend);
-FreeResource();
+get(m_pLbTextDirection,"LB_LEGEND_TEXTDIR");
+
+m_pLbTextDirection->SetDropDownLineCount(3);
+
+get(m_pBxPosition,"boxPOSITION");
+m_pLegendPositionResources = new LegendPositionResources(m_pBxPosition);
}
SchLegendPosTabPage::~SchLegendPosTabPage()
{
+delete m_pLegendPositionResources;
}
-SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow,
-const SfxItemSet& rOutAttrs)
+SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet&
rOutAttrs)
{
return new SchLegendPosTabPage(pWindow, rOutAttrs);
}
sal_Bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
-m_apLegendPositionResources->writeToItemSet(rOutAttrs);
+m_pLegendPositionResources->writeToItemSet(rOutAttrs);
-if( m_aLbTextDirection.GetSelectEntryCount() > 0 )
-rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR,
m_aLbTextDirection.GetSelectEntryValue() ) );
+if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
+rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR,
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 10:10:26AM +0100, Samuel Mehrbrodt wrote: > Hi Robert, > > I think there is no formal process when to include a new font. If it makes > sense, it's ok. Fonts are not that big. Fonts CAN be that big :) Look at TeX Live, of its 3.5 GB install, 1.4 GB are fonts. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk
writerfilter/Library_writerfilter.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 963fb6a84f1366028b185519144ce18e61d630c0 Author: Stephan Bergmann Date: Wed Nov 27 11:17:38 2013 +0100 Need to link against sax now Change-Id: I7f54513f93319df0a4846fd79c78bb65327abbbd diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 7306cec..ff16aac 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ msfilter \ oox \ sal \ +sax \ sfx \ sot \ svt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - graphite/graphite-2.3.1.patch sw/source
graphite/graphite-2.3.1.patch | 20
sw/source/core/access/accportions.cxx |2 +-
sw/source/core/access/acctable.cxx|2 +-
sw/source/core/crsr/crsrsh.cxx|1 -
sw/source/core/docnode/node.cxx |2 +-
sw/source/core/fields/expfld.cxx |2 +-
sw/source/ui/index/cnttab.cxx |2 +-
sw/source/ui/uiview/view.cxx |6 +++---
sw/source/ui/utlui/content.cxx|1 -
9 files changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 21745044cbac84fdf38bbf45c96338b11953897f
Author: Pavel JanÃk
Date: Wed Nov 27 09:36:54 2013 +
WaE: Remove unused variable.
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 11e3740..08e00dd 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -2714,7 +2714,6 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
SwContent* pCnt = (SwContent*)pEntry->GetUserData();
-sal_Bool bSel = sal_False;
sal_uInt16 nJumpType = pCnt->GetParent()->GetType();
switch(nJumpType)
{
commit 4956355877b7c9368f99ef4a91b6a1805ceac32c
Author: Pavel JanÃk
Date: Wed Nov 27 09:35:48 2013 +
WaE: reorder initializations properly to prevent compiler warnings.
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index cce9c32..eedcd04 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -727,6 +727,9 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
: SfxViewShell( _pFrame, SWVIEWFLAGS ),
aPageStr( SW_RES( STR_PAGE )),
nNewPage(USHRT_MAX),
+//IAccessibility2 Implementation 2009-
+nOldPageNum(0),
+//-IAccessibility2 Implementation 2009
pNumRuleNodeFromDoc(0), // #i23726#
pEditWin( new SwEditWin( &_pFrame->GetWindow(), *this ) ),
pWrtShell(0),
@@ -763,9 +766,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
nFormSfxId( USHRT_MAX ),
nLastPasteDestination( 0x ),
nLeftBorderDistance( 0 ),
-//IAccessibility2 Implementation 2009-
-nOldPageNum(0),
-//-IAccessibility2 Implementation 2009
nRightBorderDistance( 0 ),
bInMailMerge(sal_False),
bInDtor(sal_False),
commit e23ad02d49504ff89e7a4fe68e49bb758854eeaf
Author: Pavel JanÃk
Date: Wed Nov 27 09:34:44 2013 +
WaE: unname unused argument to prevent compiler warnings.
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c789f38..b87e317 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -4053,7 +4053,7 @@ void SwTokenWindow::SetFocus2theAllBtn()
m_pParent->SetFocus2theAllBtn();
}
}
-sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control*
pCurControl) const
+sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control*
/* pCurControl */) const
{
//there are only one entry-text button and only one page-number button,
//so we need not add index for these two buttons.
commit 81626b7c35790ca326c220108695730ea7a200b1
Author: Pavel JanÃk
Date: Wed Nov 27 09:31:30 2013 +
WaE: reorder initializations properly to prevent compiler warnings.
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 253e9aa..6274bd8d 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1155,8 +1155,8 @@ SwInputField::SwInputField( SwInputFieldType* pFieldType,
, aContent(rContent)
, aPText(rPrompt)
, nSubType(nSub)
-, mpFmtFld( NULL )
, mbIsFormField( bIsFormField )
+, mpFmtFld( NULL )
{
}
commit 1bf8fcfd6fd447af3c24ffd41955a3ca2fb21356
Author: Pavel JanÃk
Date: Wed Nov 27 09:30:18 2013 +
WaE: unname unused argument to prevent compiler warnings.
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 55d8b08..302fe2a 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1374,7 +1374,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
//Solution:Add a input param to identify if the acc table should be disposed.
//add a flag(bNeedDel) to indicate whether to del corresponding frm even in
doc loading process,
//void SwCntntNode::DelFrms()
-void SwCntntNode::DelFrms( sal_Bool bNeedDel, sal_Bool bIsDisposeAccTable )
+void SwCntntNode::DelFrms( sal_Bool /* bNeedDel */, sal_Bool
bIsDisposeAccTable )
//-IAccessibility2 Implementation 2009
{
if( !GetDepends() )
commit 255ab8c307c82b4c7b3379a3509e56e304eb475f
Author: Pavel JanÃk
Date: Wed Nov 27 09:29:03 2013 +
WaE: Remove unused variable.
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index b6375c6..e0936bb 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -452,7 +452,6 @@ void SwCrsrShell::F
[Libreoffice-commits] core.git: sax/source
sax/source/tools/fastattribs.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1afc1c033b1ce636eb258a218a26f24c7ad648ed
Author: Michael Meeks
Date: Wed Nov 27 10:06:24 2013 +
Urgh - add embarassingly missing ~
Change-Id: I6ffcb1561920eba2cbc3fa019431d84f07386570
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 595c736..617376f 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -28,7 +28,7 @@ namespace sax_fastparser
{
// wasteage to keep MSVC happy vs. an in-line {}
-FastTokenHandlerBase::FastTokenHandlerBase()
+FastTokenHandlerBase::~FastTokenHandlerBase()
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/crsrsh.hxx |1 - sw/qa/tiledrendering/tiledrendering.cxx |1 - sw/source/core/draw/dview.cxx |3 --- sw/source/core/layout/pagechg.cxx |1 - sw/source/core/layout/wsfrm.cxx |1 - sw/source/core/text/atrstck.cxx |1 - sw/source/core/text/inftxt.cxx |1 - sw/source/core/text/txtfrm.cxx |1 - sw/source/core/unocore/unoportenum.cxx |1 - sw/source/core/view/viewsh.cxx |1 - sw/source/filter/ww8/wrtw8esh.cxx |3 --- sw/source/filter/ww8/ww8graf.cxx|1 - sw/source/ui/app/appopt.cxx |1 - sw/source/ui/docvw/edtwin.cxx |1 - sw/source/ui/index/cnttab.cxx |3 --- sw/source/ui/uiview/view2.cxx |1 - sw/source/ui/uno/unotxdoc.cxx |1 - 17 files changed, 23 deletions(-) New commits: commit 19d0b079dceb2ca4e241a9394407d8ddf2a6f42f Author: Takeshi Abe Date: Wed Nov 27 18:53:09 2013 +0900 Drop duplicate #include Change-Id: I8c5daff82b96e4d9e2e89e18473c9be8c9c8162b diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 8548d91..ddc4f2b 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -36,7 +36,6 @@ #include #include #include -#include #include class KeyCode; diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 57b512c..321a2d8 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include using namespace ::com::sun::star; diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 266324d..306d5ce 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -47,9 +47,6 @@ #include // #i7672# -#include - -#include #include #include diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 9e1a49d5..2cfb864 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -40,7 +40,6 @@ #include #include "viewimp.hxx" -#include "viewopt.hxx" #include "pagefrm.hxx" #include "rootfrm.hxx" #include "cntfrm.hxx" diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 985b787..bb7b03f 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -64,7 +64,6 @@ #include // OD 2004-05-24 #i28701# #include -#include using namespace ::com::sun::star; diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index a1c8d96..848f98b 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -53,7 +53,6 @@ #include #include #include -#include #define STACK_INCREMENT 4 diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index adf78fa..ecde3b0 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -69,7 +69,6 @@ // #i12836# enhanced pdf export #include #include -#include #include diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 41ff7e9..db2f479 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -33,7 +33,6 @@ #include #include "rootfrm.hxx" #include -#include #include #include #include diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 8d5377d..39955aa 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 143ac40..add342d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -63,7 +63,6 @@ #include #include #include -#include #include "../../ui/inc/view.hxx" #include diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 5b7ab4a..93a1294 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -92,9 +92,6 @@ #include #include #include -#include -#include -#include #include #include #include "sfx2/sfxsids.hrc" diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 6ff803e..6b6ffdf 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -92,7 +92,6 @@ #include #include #include -#include "ww8par2.hxx" using ::editeng::SvxBorderLine; using namespace ::com::sun::star; diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 4c1c241..4ce4aac 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edt
[Libreoffice-commits] core.git: include/sax sax/source
include/sax/fastattribs.hxx |2 +-
sax/source/tools/fastattribs.cxx |5 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit bc90fb9e3072d751158a8ea0ca0a893d271b8973
Author: Michael Meeks
Date: Wed Nov 27 09:47:40 2013 +
fastparser: Outline virtual destructor to please MSVC++.
Change-Id: I8368698e80e5ebe339b822a9e0e767e8ba867e07
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index f1f64dd..bb1b93d 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -53,7 +53,7 @@ typedef std::vector< UnknownAttribute > UnknownAttributeList;
class SAX_DLLPUBLIC FastTokenHandlerBase
{
public:
-virtual ~FastTokenHandlerBase() {}
+virtual ~FastTokenHandlerBase();
virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32
nLength ) const = 0;
};
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index bc63b3e..595c736 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -27,6 +27,11 @@ using namespace ::com::sun::star::xml::sax;
namespace sax_fastparser
{
+// wasteage to keep MSVC happy vs. an in-line {}
+FastTokenHandlerBase::FastTokenHandlerBase()
+{
+}
+
UnknownAttribute::UnknownAttribute( const OUString& rNamespaceURL, const
OString& rName, const sal_Char* pValue )
: maNamespaceURL( rNamespaceURL ), maName( rName ), maValue( pValue )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/AllLangResTarget_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
include/svx/linkwarn.hxx | 16 +
svx/AllLangResTarget_svx.mk |1
svx/UIConfig_svx.mk |1
svx/source/dialog/linkwarn.cxx| 104 +++---
svx/source/dialog/linkwarn.hrc| 53 ---
svx/source/dialog/linkwarn.src| 74 ---
svx/uiconfig/ui/linkwarndialog.ui | 89
7 files changed, 103 insertions(+), 235 deletions(-)
New commits:
commit 34592b9189bf47438a452479972968d33a3a4c1b
Author: Caolán McNamara
Date: Wed Nov 27 09:35:33 2013 +
convert link warning dialog to .ui
the amount of code required for the new vs old dialog is amusing
Change-Id: I7feee572eecd94fab3e8c2210755b70832cbd2f2
diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx
index ba0d841..beb7154 100644
--- a/include/svx/linkwarn.hxx
+++ b/include/svx/linkwarn.hxx
@@ -21,24 +21,16 @@
#define INCLUDED_SVX_LINKWARN_HXX
#include
-#include
-#include
+#include
#include
-class SVX_DLLPUBLIC SvxLinkWarningDialog : public SfxModalDialog
+class SVX_DLLPUBLIC SvxLinkWarningDialog : public MessageDialog
{
private:
-FixedImage m_aQueryImage;
-FixedText m_aInfoText;
-OKButtonm_aLinkGraphicBtn;
-CancelButtonm_aEmbedGraphicBtn;
-FixedLine m_aOptionLine;
-CheckBoxm_aWarningOnBox;
-
-voidInitSize();
+CheckBox* m_pWarningOnBox;
public:
- SvxLinkWarningDialog( Window* pParent, const OUString& _rFileName
);
+SvxLinkWarningDialog(Window* pParent, const OUString& _rFileName);
virtual ~SvxLinkWarningDialog();
};
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index f2674d1..002b339 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/imapdlg.src \
svx/source/dialog/langbox.src \
svx/source/dialog/language.src \
-svx/source/dialog/linkwarn.src \
svx/source/dialog/passwd.src \
svx/source/dialog/prtqry.src \
svx/source/dialog/ruler.src \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index cb4c759..1780983 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/redlinecontrol \
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index e15d795..e46ebfc 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -17,119 +17,33 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "linkwarn.hrc"
-#include "svx/linkwarn.hxx"
-#include "svx/dialogs.hrc"
-#include "svx/dialmgr.hxx"
-#include
-#include
+#include
#include
-SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString&
_rFileName ) :
-SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_LINK_WARNING ) ),
-m_aQueryImage ( this, SVX_RES( FI_QUERY ) ),
-m_aInfoText ( this, SVX_RES( FT_INFOTEXT ) ),
-m_aLinkGraphicBtn ( this, SVX_RES( PB_OK ) ),
-m_aEmbedGraphicBtn ( this, SVX_RES( PB_NO ) ),
-m_aOptionLine ( this, SVX_RES( FL_OPTION ) ),
-m_aWarningOnBox ( this, SVX_RES( CB_WARNING_OFF ) )
+SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString&
_rFileName )
+: MessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui")
{
-FreeResource();
-
-// set questionmark image
-m_aQueryImage.SetImage( QueryBox::GetStandardImage() );
+get(m_pWarningOnBox, "ask");
// replace filename
-OUString sInfoText = m_aInfoText.GetText();
+OUString sInfoText = get_primary_text();
sInfoText = sInfoText.replaceAll("%FILENAME", _rFileName);
-m_aInfoText.SetText( sInfoText );
+set_primary_text( sInfoText );
// load state of "warning on" checkbox from misc options
SvtMiscOptions aMiscOpt;
-m_aWarningOnBox.Check( aMiscOpt.ShowLinkWarningDialog() == sal_True );
+m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() == sal_True );
if( aMiscOpt.IsShowLinkWarningDialogReadOnly() )
-m_aWarningOnBox.Disable();
-
-// set focus to Cancel button
-m_aEmbedGraphicBtn.GrabFocus();
-
-// calculate and set the size of the dialog and its controls
-InitSize();
+m_pWarningOnBox->Disable();
}
-// ---
-
SvxLinkWarningDialog::~SvxLinkWarningDialog()
{
// save value of "warning off" checkbox, if necessary
SvtMiscOptions aMiscOpt;
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8c2924c0cc8706a7e89ba9e16d15153b2d05b647
Author: Michael Meeks
Date: Wed Nov 27 09:33:03 2013 +
Fix windows compile.
Change-Id: Ibf6d11e513ed615e29d97ab21c8b02315b42d75c
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index e55baf2..9b82049 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -108,7 +108,7 @@ css::uno::Sequence< ::sal_Int8 > SAL_CALL
OOXMLFastTokenHandler::getUTF8Identifi
#endif
}
-::sal_Int32 OOXMLFastTokenHandler::getTokenDirect( const char *pStr, sal_Int32
nLength ) const
+sal_Int32 OOXMLFastTokenHandler::getTokenDirect( const char *pStr, sal_Int32
nLength ) const
{
struct tokenmap::token * pToken =
tokenmap::Perfect_Hash::in_word_set( pStr, nLength );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide Makefile.in
Makefile.in |3
bin/gbuild-to-ide | 170 ++
2 files changed, 172 insertions(+), 1 deletion(-)
New commits:
commit 61e66d762d0485abaff497e606c3819536d42437
Author: Tor Lillqvist
Date: Tue Nov 26 21:39:58 2013 +0200
Add initial hacks for eventual Xcode support
Just some late-night hacking without much thinking whether it makes
any sense and without any clear picture of what I am doing. Probably
useless. No promises I will ever continue on this.
Change-Id: Ie61925129bb678a17b30cb25a7882ccfe3a1de82
diff --git a/Makefile.in b/Makefile.in
index cac8fc5..e3deee7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,8 @@ $(1)-ide-integration:
endef
$(foreach ide,\
- kdevelop, \
+ kdevelop \
+ xcode, \
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
endif # MAKE_RESTARTS
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index ac008c5..63f917f 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -277,6 +277,174 @@ VersionControl=kdevgit
self.write_modulestub(location, modulename)
self.write_modulebeef(location, modulename)
+class XcodeIntegrationGenerator(IdeIntegrationGenerator):
+def indent(self, file, level):
+if level == 0:
+return
+for i in range(0, level):
+file.write(' ')
+
+def write_object(self, object, file, indent):
+if isinstance(object, int):
+file.write('%d' % object)
+elif isinstance(object, str) and not re.search('[^A-Za-z0-9_]',
object):
+file.write('%s' % object)
+elif isinstance(object, str):
+file.write('"%s"' % object)
+elif isinstance(object, dict):
+self.write_dict(object, file, indent)
+
+# Write a dictionary out as an "old-style (NeXT) ASCII plist"
+def write_dict(self, dict, file, indent):
+file.write('{')
+file.write('\n')
+for key in sorted(dict.keys()):
+self.indent(file, indent+1)
+file.write('%s = ' % key)
+self.write_object(dict[key], file, indent+1)
+file.write(';\n')
+self.indent(file, indent)
+file.write('}')
+
+def write_dict_to_plist(self, dict, file):
+file.write('// !$*UTF8*$!\n')
+indent = 0
+self.write_dict(dict, file, 0)
+
+def get_product_type(self, modulename):
+if modulename in self.gbuildparser.libs:
+return 'com.apple.product-type.library.dynamic'
+elif modulename in self.gbuildparser.exes:
+return 'com.apple.product-type.something'
+
+counter = 0
+def generate_id(self):
+XcodeIntegrationGenerator.counter = XcodeIntegrationGenerator.counter
+ 1
+return str('X%07x' % XcodeIntegrationGenerator.counter)
+
+def generate_build_phases(self, modulename):
+result = [ self.sourcesBuildPhaseId ]
+return result
+
+def generate_root_object(self, modulename):
+result = { 'isa':'PBXProject',
+ 'attributes':{ 'LastUpgradeCheck':'0500',
+ 'ORGANIZATIONNAME':'LibreOffice' },
+ 'buildConfigurationList':self.generate_id(),
+ 'compatibilityVersion':'Xcode 3.2',
+ 'hasScannedForEncodings':0,
+ 'knownRegions':['en'],
+ 'mainGroup':self.mainGroupId,
+ 'productRefGroup':self.productRefGroupId,
+ 'projectDirPath':'',
+ 'projectRoot':'',
+ 'targets':self.targetId }
+return result
+
+def generate_target(self, modulename):
+result = { 'isa':'PBXNativeTarget',
+ 'buildConfigurationList':self.generate_id(),
+ 'buildPhases':self.generate_build_phases(modulename),
+ 'buildRules':[],
+ 'dependencies':[],
+ 'name':modulename,
+ 'productName':modulename,
+ 'productReference':self.productReferenceId,
+ 'productType':self.get_product_type(modulename) }
+return result
+
+def generate_main_group(self, modulename):
+result = { 'isa':'PBXGroup',
+ 'children':[ self.subMainGroupId, self.productGroupId ],
+ 'sourceTree':'' }
+return result;
+
+def generate_sub_main_children(self, modulename):
+return {}
+
+def generate_sub_main_group(self, modulename):
+result = { 'isa':'PBXGroup',
+ 'children':self.generate_sub_main_children(modulename),
+ 'path':modulename,
+ 'sourceTree':'' }
+return result;
+
+def generate_product_group(self, modulename):
+result = { 'isa':'PBXGroup',
+ 'children':[ self.productReferenceId ],
+ 'name':'Products',
fdo69552 backward compatibility with optional arguments in calc functions
Hi Eike, You reviewed https://gerrit.libreoffice.org/6767 and commented a.o. "But more important, for backward compatibility file storage the parameter needs to be added when omitted so older versions still can calculate the function. See formula/source/core/api/token.cxx MissingConvention::isRewriteNeeded() and FormulaMissingContext::AddMoreArgs() and FormulaMissingContext::AddMissing()" The problem I have here is that with CEILING() and FLOOR() the second argument (significance) is optional and has its default value (1 or -1) depending on the sign of the first argument (value). How do I obtain this value in formula/source/core/api/token.cxx FormulaMissingContext::AddMoreArgs() and FormulaMissingContext::AddMissing()? The same problem may apply in sc/source/filter/excel/xeformula.cxx XclExpFmlaCompImpl::AppendTrailingParam(), but I take one hurdle at the time ;) Any suggestions would be greatly appreciated. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d
58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d |1 + 1 file changed, 1 insertion(+) New commits: commit a814f5e34baaf0e8938ad98d18bd003b9c410bbc Author: Caolán McNamara Date: Wed Nov 27 09:19:21 2013 + Notes added by 'git notes add' diff --git a/58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d b/58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d new file mode 100644 index 000..044dbe9 --- /dev/null +++ b/58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d @@ -0,0 +1 @@ +prefer: abbe6ce54c1ad96b1c12f019825916e078a02cb3 ___ 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' - 82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e
82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e |1 + 1 file changed, 1 insertion(+) New commits: commit c78ee8a64409731e8733f2ffbeeff04ea0ede0db Author: Caolán McNamara Date: Wed Nov 27 09:18:52 2013 + Notes added by 'git notes add' diff --git a/82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e b/82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e new file mode 100644 index 000..ebc3c31 --- /dev/null +++ b/82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e @@ -0,0 +1 @@ +prefer: 2b951c2e2fb70e796f836115f1718bf4884b06eb ___ 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' - d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d
d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d |1 + 1 file changed, 1 insertion(+) New commits: commit d4f60fc3b4f5e8d9f820babe40932118c9b0a8b6 Author: Caolán McNamara Date: Wed Nov 27 09:18:22 2013 + Notes added by 'git notes add' diff --git a/d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d b/d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 ec/653233c500478fe585e8f2b3482be7268a4584
1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 |1 + ec/653233c500478fe585e8f2b3482be7268a4584 |1 + 2 files changed, 2 insertions(+) New commits: commit aea6c9c77a051cf7eabdf8dcf66525b08e0d788e Author: Caolán McNamara Date: Wed Nov 27 09:17:59 2013 + Notes added by 'git notes add' diff --git a/1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 b/1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 @@ -0,0 +1 @@ +ignore: obsolete commit 4b2617bd08f79fb8b282ee1140be3f04cc65356e Author: Caolán McNamara Date: Wed Nov 27 09:17:48 2013 + Notes added by 'git notes add' diff --git a/ec/653233c500478fe585e8f2b3482be7268a4584 b/ec/653233c500478fe585e8f2b3482be7268a4584 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/ec/653233c500478fe585e8f2b3482be7268a4584 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Lao / Thai / Khmer Bundled Fonts
Hi Robert, I think there is no formal process when to include a new font. If it makes sense, it's ok. Fonts are not that big. I would just create a patch which adds the fonts you need and publish it on gerrit.libreoffice.org. Then there is still time to discuss this (otherwise this might get lost). Thanks Samuel Am 25.11.2013 13:04, schrieb Robert M Campbell: I was just curious, when does LibreOffice choose to bundle fonts? When is there a good reason to bundle them? I ask this because LibreOffice has a Burmese font, but no Thai, Lao, or Khmer fonts that I can tell. Droid Sans includes Thai support. Khmer OS provides Khmer support. And SIL's Mittaphab and Lao Government's Phetsarath OT are possible options for Lao, but the most widely used Lao font in Laos is Saysettha Lao. The government wants everyone to use Phetsarath OT (which is their standard). Windows 8 ships with Dok Champa, which I know little about... And SIL is working on a graphite font Mittaphap. I know Mittaphap is OFL, Phetsarath OT has no license (public domain?), so those are fair open options. Saysettha is not open source, nor is Dok Champa, to my understanding. But the real question is whether or not LibreOffice will want to include fonts for language coverage in the first place? Possible benefits I see: * Consistent look and feel for users of those languages across platforms and systems * Provides native access for people without reliable Internet (sometimes a problem in Laos) Possible problems I see: * Makes LibreOffice bigger * Could get out of hand if everyone wants to submit their favorite font * People might complain because it doesn't have their favorite Saysettha font What do you all think? -- Respectfully, *Robert M Campbell* IT Specialist for ADRA Laos & Open Source Advocate Lao Cell: +856 207 616 7299 US Phone: +1 270 681 0399 robert.rcampb...@gmail.com rcampb...@adralaos.org Visit ADRA Lao's Facebook Page at facebook.com/ADRALaos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: 3 commits - compress.py decompress.py doc-dump.py msodumper/docdirstream.py msodumper/docrecord.py msodumper/docsprm.py msodumper/docstream.py msodumper/formula.p
compress.py |4
decompress.py |4
doc-dump.py |5
msodumper/docdirstream.py | 183 +
msodumper/docrecord.py| 3701 +++
msodumper/docsprm.py | 353 +++
msodumper/docstream.py| 991
msodumper/formula.py | 727 ++
msodumper/globals.py | 479
msodumper/msocrypto.py| 77
msodumper/msodraw.py | 1318 +++
msodumper/node.py | 219 +
msodumper/ole.py | 938
msodumper/olestream.py| 220 +
msodumper/oletool.py | 65
msodumper/pptrecord.py| 1721 ++
msodumper/pptstream.py| 442 +++
msodumper/vbahelper.py| 280 ++
msodumper/xlsmodel.py | 639 +
msodumper/xlsparser.py| 753 ++
msodumper/xlsrecord.py| 5380 ++
msodumper/xlsstream.py| 550
msodumper/xmlpp.py| 149 +
ppt-dump.py |6
src/docdirstream.py | 183 -
src/docrecord.py | 3701 ---
src/docsprm.py| 353 ---
src/docstream.py | 991
src/formula.py| 727 --
src/globals.py| 479
src/msocrypto.py | 77
src/msodraw.py| 1318 ---
src/node.py | 219 -
src/ole.py| 938
src/olestream.py | 220 -
src/oletool.py| 65
src/pptrecord.py | 1721 --
src/pptstream.py | 442 ---
src/vbahelper.py | 280 --
src/xlsmodel.py | 639 -
src/xlsparser.py | 753 --
src/xlsrecord.py | 5380 --
src/xlsstream.py | 550
src/xmlpp.py | 149 -
test/doc/test.py |1
vbadump.py|4
xls-dump.py |9
47 files changed, 19199 insertions(+), 19204 deletions(-)
New commits:
commit a88102b95a18f61ef0ada3b7f3a9ad3c921a56e0
Author: Miklos Vajna
Date: Wed Nov 27 09:26:18 2013 +0100
test/doc/test.py: remove one more reference to renamed src/
diff --git a/test/doc/test.py b/test/doc/test.py
index 03eb87e..b6c4d36 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -8,7 +8,6 @@
import sys
sys.path.append(sys.path[0]+"/../..")
-sys.path.append(sys.path[0]+"/../../src")
doc_dumper = __import__('doc-dump')
from xml.etree import ElementTree
import unittest
commit 27a98c7aa1bc287f6a576e7dabaa62db1a194b68
Author: Jean-Francois Dockes
Date: Tue Nov 26 13:20:19 2013 +0100
More import statement changes after src -> msodumper
diff --git a/compress.py b/compress.py
index 7ab4a9a..72a0ad8 100755
--- a/compress.py
+++ b/compress.py
@@ -27,8 +27,8 @@
import sys, os.path, optparse
-sys.path.append(sys.path[0]+"/src")
-import vbahelper
+
+from msodumper import vbahelper
def main():
diff --git a/decompress.py b/decompress.py
index 50e7401..5b4b0fb 100755
--- a/decompress.py
+++ b/decompress.py
@@ -27,8 +27,8 @@
import sys, os.path, optparse
-sys.path.append(sys.path[0]+"/src")
-import vbahelper
+
+from msodumper import vbahelper
def main():
diff --git a/vbadump.py b/vbadump.py
index b8b2aa2..2c930ec 100755
--- a/vbadump.py
+++ b/vbadump.py
@@ -27,8 +27,8 @@
import sys, os.path, optparse, math
-sys.path.append(sys.path[0]+"/src")
-import ole, globals, node, olestream, vbahelper
+
+from msodumper import ole, globals, node, olestream, vbahelper
#codepage -> codepagename map
# note: there are some missing entries ( the commented out ones ) that
commit 16c3cf3535919c8eb16973f216baf342ae0dee51
Author: Jean-Francois Dockes
Date: Tue Nov 26 13:08:03 2013 +0100
Renamed src directory to msodumper and handle imports in a more pythonic way
diff --git a/doc-dump.py b/doc-dump.py
index 7279a34..65152a8 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -8,9 +8,8 @@
import sys
sys = reload(sys)
sys.setdefaultencoding("utf-8")
-sys.path.append(sys.path[0]+"/src")
-import globals
-import docstream
+
+from msodumper import globals, docstream
class DOCDumper:
def __init__(self, filepath, params):
diff --git a/msodumper/__init__.py b/msodumper/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/src/docdirstream.py b/msodumper/docdirstream.py
similarity index 100%
rename from src/docdirstream.py
rename to msodumper/docdirstream.py
diff --git a/src/docrecord.py b/msodumper/docrecord.py
similarity index 100%
rename from src/docrecord.py
rename to msodumper/docrecord.py
diff --git a/src/docsprm.py b/msodumper/docsprm.py
similarity index 100%
rename from src/docsprm.py
rename to msodumper/docsprm.py
diff --git a/src/docstream.py b/msod
[Libreoffice-commits] dev-tools.git: git-hooks/contrib
git-hooks/contrib/mso-dumper.git/hooks/update | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
New commits:
commit cbddd8325c50eab71792838706dc6acfc8db6083
Author: Miklos Vajna
Date: Wed Nov 27 09:17:11 2013 +0100
git-hooks: mso-dumper is now on gerrit
Change-Id: I7aed2559c122c384673e27d5533e4b546f0a21b1
diff --git a/git-hooks/contrib/mso-dumper.git/hooks/update
b/git-hooks/contrib/mso-dumper.git/hooks/update
index 5abf97c..4308a20 100755
--- a/git-hooks/contrib/mso-dumper.git/hooks/update
+++ b/git-hooks/contrib/mso-dumper.git/hooks/update
@@ -9,11 +9,25 @@
# (2) make this file executable by "chmod +x update".
#
+# prevent pushing from anyone but the logerrit user
+if [ "$(id -u -n )" != "logerrit" ] ; then
+ echo "*** The reference for this repo is gerrit. do not push directly
to fdo" >&2
+ exit 1
+fi
+from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
+
project=$(cat $GIT_DIR/description)
recipients="libreoffice-comm...@lists.freedesktop.org"
ref_type=$(git cat-file -t "$3")
+# Avoid re-introducing obsolete tags
+if grep -q "^$1$" hooks/obsolete-tags; then
+ echo "*** Re-introducing an obsolete tag ($1) is not allowed in this
repo" >&2
+ echo "*** Use corereleasebranches/killtagslocal.sh from
contrib/dev-tools.git to get rid of them." >&2
+ exit 1
+fi
+
# Only allow annotated tags in a shared repo
# Remove this code to treat dumb tags the same as everything else
case "$1","$ref_type" in
@@ -122,5 +136,5 @@ else
done
fi |
mail -s "$subject" -a "X-Git-Repository:
git://anongit.freedesktop.org/git/libreoffice/contrib/mso-dumper.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From:
$from" $recipients
exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 60769, which changed state. Bug 60769 Summary: FILEOPEN, FILESAVE, "Could not save document, error in writing sub document context.xml" then corrupt file. https://bugs.freedesktop.org/show_bug.cgi?id=60769 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: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 382421189fd7cd421b82d3397dad6860cd6536e8
Author: Stephan Bergmann
Date: Wed Nov 27 09:15:14 2013 +0100
Improve exception message
Change-Id: I06ffe3088546d55b29d61ccfae16937d8a7ce9e8
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 764c0ca..dbb5dcd 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -422,7 +422,11 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction
(sal_Int32 nIndex)
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
if (nIndex<0 || nIndex>=getAccessibleActionCount())
-throw ::com::sun::star::lang::IndexOutOfBoundsException();
+throw ::com::sun::star::lang::IndexOutOfBoundsException(
+("VCLXAccessibleBox::doAccessibleAction: index "
+ + OUString::number(nIndex) + " not among 0.."
+ + OUString::number(getAccessibleActionCount())),
+static_cast(this));
if (m_aBoxType == COMBOBOX)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1533129759c0017413efe2213bfe503c26dc16f0 Author: Stephan Bergmann Date: Wed Nov 27 09:12:38 2013 +0100 Revert sense in VCLXAccessibleBox::getAccessibleActionCount again ...this had been switched from "m_bIsDropDownBox ? 1 : 0" to "m_bIsDropDownBox ? 0 : 1" in efb23f29983f87104a684e7fab00b84fc59d131d "Integrate branch of IAccessible2" for no apparent reason and broke JunitTest_testtools_unoapi. Change-Id: I276d2f452648387a5fa693349cf868787b2d48e1 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 7aa7836..764c0ca 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -409,7 +409,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) // There is one action for drop down boxes (toggle popup) and none for // the other boxes. -return m_bIsDropDownBox ? 0 : 1; +return m_bIsDropDownBox ? 1 : 0; } sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Vendors Name via UNO API / Basic Macros
On 26/11/2013 17:42, Lionel Elie Mamane wrote: On Tue, Nov 26, 2013 at 02:36:41PM +0100, Fernand Vanrie wrote: On 26/11/2013 13:56, Lionel Elie Mamane wrote: On Thu, Nov 21, 2013 at 08:34:04PM +0100, Jan Holesovsky wrote: Thomas Krumbein píše v Pá 15. 11. 2013 v 15:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. Have you filed a bugreport, please? A minimal example of the macro that fails would be most appreciated. Well - it´s not a bug, because you mentioned the change in release-notes of version 4.1. There are many ways how to make the problem less annoying in Basic ;-) - we control the Basic implementation, so can work around many things, and if we are lucky, this will be one of them. I am sure we'd try to do that before the release with the incompatible change if we knew early. Well, I considered doing some "magic" that when the property is written, why not a extra property , "date" = isodate as it was (all old code can run it) "cdate" = new way That's essentially a variant of "roll back the change". 1) This requires an incompatible change again; 4.2 would be incompatible with 4.1. is suppose that there is not a lot off API-basic code around for 4.2 :-) 2) Applied to Time, it leaves the problem of round-tripping. 3) If we set DataFieldProperty to the name of the new (pseudo?)property (UnoDate? DateAsUNO? StructDate?), the other problems I'm thinking about should go OK, except that indirect access through DataFieldProperty will still be incompatible, but that should be minor? Go for it, then we can go for 4.1. If not: then please let it know, we can start changing the code using a conversion Greetz Fernand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/unx
vcl/unx/generic/gdi/salgdi3.cxx |2 +-
vcl/unx/headless/svptext.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1ef0a5008bec9d9bf17824ea78d4b2510d1903d5
Author: Herbert Dürr
Date: Wed Nov 27 07:17:44 2013 +
#i123755# adjust kernpair hashmap resize() to rehash()
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index e80b492..4fdad0a 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -189,7 +189,7 @@ void PspKernInfo::Initialize() const
return;
// feed psprint's kerning list into a lookup-friendly container
-maUnicodeKernPairs.resize( rKernPairs.size() );
+maUnicodeKernPairs.rehash( rKernPairs.size() );
PspKernPairs::const_iterator it = rKernPairs.begin();
for(; it != rKernPairs.end(); ++it )
{
commit ec653233c500478fe585e8f2b3482be7268a4584
Author: Herbert Dürr
Date: Wed Nov 27 06:55:29 2013 +
#i123755# adjust kernpair hashmap resize() to rehash()
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 1d2f6fe..9288139 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -131,7 +131,7 @@ void PspKernInfo::Initialize() const
return;
// feed psprint's kerning list into a lookup-friendly container
-maUnicodeKernPairs.resize( rKernPairs.size() );
+maUnicodeKernPairs.rehash( rKernPairs.size() );
PspKernPairs::const_iterator it = rKernPairs.begin();
for(; it != rKernPairs.end(); ++it )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-parser.y |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 766cdc8a603b17710f8c60558c07e4b64cdda54b
Author: Stephan Bergmann
Date: Wed Nov 27 09:00:39 2013 +0100
Silence false "may be used uninitialized" warnings
Change-Id: Ie708de4a7fbd34e1ab3c417688de79d5bdf0e0b8
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index 77fcd7e..15bb011 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -174,7 +174,7 @@ bool coerce(
{
assert(lhs != 0);
assert(rhs != 0);
-bool ok;
+bool ok = bool(); // avoid warnings
switch (lhs->type) {
case unoidl::detail::SourceProviderExpr::TYPE_BOOL:
ok = rhs->type != unoidl::detail::SourceProviderExpr::TYPE_BOOL;
@@ -431,7 +431,10 @@ Found findEntity(
+ argName));
return FOUND_ERROR;
} else {
-
unoidl::detail::SourceProviderType::Type argT;
+
unoidl::detail::SourceProviderType::Type
+argT
+=
unoidl::detail::SourceProviderType::Type();
+// avoid warnings
switch (argEnt->kind) {
case
unoidl::detail::SourceProviderEntity::KIND_LOCAL:
if (e->pad.is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
