Author: jani
Date: Sat Oct 26 14:59:22 2013
New Revision: 1536001
URL: http://svn.apache.org/r1536001
Log:
merge from trunk
Modified:
openoffice/branches/l10n40/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
openoffice/branches/l10n40/main/basegfx/source/polygon/b2dpolygontools.cxx
openoffice/branches/l10n40/main/connectivity/source/commontools/ConnectionWrapper.cxx
openoffice/branches/l10n40/main/connectivity/source/resource/conn_shared_res.src
openoffice/branches/l10n40/main/cppuhelper/source/findsofficepath.c
openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.cxx
openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.hrc
openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.src
openoffice/branches/l10n40/main/cui/source/options/optsave.cxx
openoffice/branches/l10n40/main/cui/source/tabpages/tpbitmap.cxx
openoffice/branches/l10n40/main/cui/source/tabpages/tpcolor.cxx
openoffice/branches/l10n40/main/cui/source/tabpages/tplneend.cxx
openoffice/branches/l10n40/main/dbaccess/source/ui/browser/unodatbr.cxx
openoffice/branches/l10n40/main/default_images/introabout/about.png
openoffice/branches/l10n40/main/desktop/win32/source/setup/setup.ulf
openoffice/branches/l10n40/main/dtrans/source/win32/dtobj/DOTransferable.cxx
openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layout.xsl
openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl
openoffice/branches/l10n40/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
openoffice/branches/l10n40/main/io/source/TextOutputStream/TextOutputStream.cxx
openoffice/branches/l10n40/main/languages/source/templates/connectivity.pot
openoffice/branches/l10n40/main/languages/source/templates/desktop.pot
openoffice/branches/l10n40/main/languages/source/templates/readlicense_oo.pot
openoffice/branches/l10n40/main/officecfg/registry/data/org/openoffice/VCL.xcu
openoffice/branches/l10n40/main/readlicense_oo/docs/readme/readme.xrm
openoffice/branches/l10n40/main/sal/ (props changed)
openoffice/branches/l10n40/main/sc/source/ui/app/transobj.cxx
openoffice/branches/l10n40/main/sc/source/ui/inc/transobj.hxx
openoffice/branches/l10n40/main/sd/source/core/sdpage.cxx
openoffice/branches/l10n40/main/sd/source/ui/table/tablefunction.cxx
openoffice/branches/l10n40/main/sd/source/ui/view/drviews1.cxx
openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
openoffice/branches/l10n40/main/sfx2/inc/sfx2/dinfdlg.hxx
openoffice/branches/l10n40/main/sfx2/inc/sfx2/shell.hxx
openoffice/branches/l10n40/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx
openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.cxx
openoffice/branches/l10n40/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
openoffice/branches/l10n40/main/sot/source/sdstor/stgstrms.cxx
openoffice/branches/l10n40/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
openoffice/branches/l10n40/main/svgio/source/svgreader/svgstyleattributes.cxx
openoffice/branches/l10n40/main/svtools/source/graphic/grfmgr.cxx
openoffice/branches/l10n40/main/svx/inc/svx/fillctrl.hxx
openoffice/branches/l10n40/main/svx/inc/svx/sdrundomanager.hxx
openoffice/branches/l10n40/main/svx/source/svdraw/sdrundomanager.cxx
openoffice/branches/l10n40/main/svx/source/tbxctrls/fillctrl.cxx
openoffice/branches/l10n40/main/sw/inc/ndtxt.hxx
openoffice/branches/l10n40/main/sw/source/core/layout/paintfrm.cxx
openoffice/branches/l10n40/main/sw/source/core/text/EnhancedPDFExportHelper.cxx
openoffice/branches/l10n40/main/sw/source/core/txtnode/txtedt.cxx
openoffice/branches/l10n40/main/sw/source/core/undo/untblk.cxx
openoffice/branches/l10n40/main/sw/source/ui/config/optpage.cxx
openoffice/branches/l10n40/main/sw/source/ui/uno/unotxdoc.cxx
openoffice/branches/l10n40/main/vcl/source/fontsubset/sft.cxx
openoffice/branches/l10n40/main/vcl/win/source/gdi/salbmp.cxx
Modified:
openoffice/branches/l10n40/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
---
openoffice/branches/l10n40/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
(original)
+++
openoffice/branches/l10n40/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
Sat Oct 26 14:59:22 2013
@@ -532,6 +532,14 @@ namespace basegfx
*/
bool containsOnlyHorizontalAndVerticalEdges(const B2DPolygon&
rCandidate);
+ /// get the tangent with which the given point is entered seen from
the previous
+ /// polygon path data. Take into account all stuff like closed state,
zero-length edges and others.
+ B2DVector getTangentEnteringPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndex);
+
+ /// get the tangent with which the given point is left seen from the
following
+ /// polygon path data. Take into account all stuff like closed state,
zero-length edges and others.
+ B2DVector getTangentLeavingPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndex);
+
} // end of namespace tools
} // end of namespace basegfx
Modified:
openoffice/branches/l10n40/main/basegfx/source/polygon/b2dpolygontools.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/basegfx/source/polygon/b2dpolygontools.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/basegfx/source/polygon/b2dpolygontools.cxx
(original)
+++ openoffice/branches/l10n40/main/basegfx/source/polygon/b2dpolygontools.cxx
Sat Oct 26 14:59:22 2013
@@ -3660,6 +3660,88 @@ namespace basegfx
return true;
}
+ B2DVector getTangentEnteringPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndex)
+ {
+ B2DVector aRetval(0.0, 0.0);
+ const sal_uInt32 nCount(rCandidate.count());
+
+ if(nIndex >= nCount)
+ {
+ // out of range
+ return aRetval;
+ }
+
+ // start immediately at prev point compared to nIndex
+ const bool bClosed(rCandidate.isClosed());
+ sal_uInt32 nPrev(bClosed ? (nIndex + nCount - 1) % nCount : nIndex
? nIndex - 1 : nIndex);
+
+ if(nPrev == nIndex)
+ {
+ // no previous, done
+ return aRetval;
+ }
+
+ B2DCubicBezier aSegment;
+
+ // go backward in the polygon; if closed, maximal back to start
index (nIndex); if not closed,
+ // until zero. Use nIndex as stop criteria
+ while(nPrev != nIndex)
+ {
+ // get BezierSegment and tangent at the *end* of segment
+ rCandidate.getBezierSegment(nPrev, aSegment);
+ aRetval = aSegment.getTangent(1.0);
+
+ if(!aRetval.equalZero())
+ {
+ // if we have a tangent, return it
+ return aRetval;
+ }
+
+ // prepare index before checked one
+ nPrev = bClosed ? (nPrev + nCount - 1) % nCount : nPrev ?
nPrev - 1 : nIndex;
+ }
+
+ return aRetval;
+ }
+
+ B2DVector getTangentLeavingPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndex)
+ {
+ B2DVector aRetval(0.0, 0.0);
+ const sal_uInt32 nCount(rCandidate.count());
+
+ if(nIndex >= nCount)
+ {
+ // out of range
+ return aRetval;
+ }
+
+ // start at nIndex
+ const bool bClosed(rCandidate.isClosed());
+ sal_uInt32 nCurrent(nIndex);
+ B2DCubicBezier aSegment;
+
+ // go forward; if closed, do this until once around and back at
start index (nIndex); if not
+ // closed, until last point (nCount - 1). Use nIndex as stop
criteria
+ do
+ {
+ // get BezierSegment and tangent at the *beginning* of segment
+ rCandidate.getBezierSegment(nCurrent, aSegment);
+ aRetval = aSegment.getTangent(0.0);
+
+ if(!aRetval.equalZero())
+ {
+ // if we have a tangent, return it
+ return aRetval;
+ }
+
+ // prepare next index
+ nCurrent = bClosed ? (nCurrent + 1) % nCount : nCurrent + 1 <
nCount ? nCurrent + 1 : nIndex;
+ }
+ while(nCurrent != nIndex);
+
+ return aRetval;
+ }
+
} // end of namespace tools
} // end of namespace basegfx
Modified:
openoffice/branches/l10n40/main/connectivity/source/commontools/ConnectionWrapper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/commontools/ConnectionWrapper.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
---
openoffice/branches/l10n40/main/connectivity/source/commontools/ConnectionWrapper.cxx
(original)
+++
openoffice/branches/l10n40/main/connectivity/source/commontools/ConnectionWrapper.cxx
Sat Oct 26 14:59:22 2013
@@ -196,7 +196,10 @@ namespace
{}
bool operator() (const ::com::sun::star::beans::PropertyValue&
lhs, const ::com::sun::star::beans::PropertyValue& rhs) const
{
- return !!(lhs.Name.equalsIgnoreAsciiCase( rhs.Name ));
+ const rtl_uString* l = lhs.Name.pData;
+ const rtl_uString* r = rhs.Name.pData;
+ const int c =
rtl_ustr_compareIgnoreAsciiCase_WithLength( l->buffer, l->length, r->buffer,
r->length );
+ return (c < 0);
}
};
Modified:
openoffice/branches/l10n40/main/connectivity/source/resource/conn_shared_res.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/resource/conn_shared_res.src?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
---
openoffice/branches/l10n40/main/connectivity/source/resource/conn_shared_res.src
(original)
+++
openoffice/branches/l10n40/main/connectivity/source/resource/conn_shared_res.src
Sat Oct 26 14:59:22 2013
@@ -123,7 +123,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED
String STR_UNSPECIFIED_ERROR
{
- Text [ en-US ] = "An unknown error occured.";
+ Text [ en-US ] = "An unknown error occurred.";
};
String STR_COULD_NOT_CREATE_ADDRESSBOOK
@@ -138,12 +138,12 @@ String STR_COULD_NOT_LOAD_LIB
String STR_ERROR_REFRESH_ROW
{
- Text [ en-US ] = "An error occured while refreshing the current row.";
+ Text [ en-US ] = "An error occurred while refreshing the current row.";
};
String STR_ERROR_GET_ROW
{
- Text [ en-US ] = "An error occured while getting the current row.";
+ Text [ en-US ] = "An error occurred while getting the current row.";
};
String STR_CAN_NOT_CANCEL_ROW_UPDATE
@@ -163,7 +163,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN
String STR_ILLEGAL_MOVEMENT
{
- Text [ en-US ] = "Illegal cursor movement occured.";
+ Text [ en-US ] = "Illegal cursor movement occurred.";
};
String STR_COMMIT_ROW
@@ -375,7 +375,7 @@ String STR_NO_CONNECTION
// dbase
String STR_COULD_NOT_DELETE_INDEX
{
- Text [ en-US ] = "The index could not be deleted. An unknown error while
accessing the file system occured.";
+ Text [ en-US ] = "The index could not be deleted. An unknown error while
accessing the file system occurred.";
};
String STR_ONL_ONE_COLUMN_PER_INDEX
{
@@ -620,11 +620,11 @@ String STR_INVALID_FILE_URL
};
String STR_NO_TABLE_CONTAINER
{
- Text [ en-US ] = "An error occured while obtaining the connection's table
container.";
+ Text [ en-US ] = "An error occurred while obtaining the connection's table
container.";
};
String STR_NO_TABLE_EDITOR_DIALOG
{
- Text [ en-US ] = "An error occured while creating the table editor
dialog.";
+ Text [ en-US ] = "An error occurred while creating the table editor
dialog.";
};
String STR_NO_TABLENAME
{
Modified: openoffice/branches/l10n40/main/cppuhelper/source/findsofficepath.c
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cppuhelper/source/findsofficepath.c?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cppuhelper/source/findsofficepath.c
(original)
+++ openoffice/branches/l10n40/main/cppuhelper/source/findsofficepath.c Sat Oct
26 14:59:22 2013
@@ -129,21 +129,7 @@ static char* platformSpecific()
*/
static char* platformSpecific()
{
- const int SEPARATOR = '/';
- const char* PATHSEPARATOR = ":";
- const char* PATHVARNAME = "PATH";
- const char* APPENDIX = "/soffice";
-
char* path = NULL;
- char* env = NULL;
- char* str = NULL;
- char* dir = NULL;
- char* file = NULL;
- char* resolved = NULL;
- char* sep = NULL;
-
- char buffer[PATH_MAX];
- int pos;
#ifdef MACOSX
/* On MacOS we have no soffice link under /usr/bin but the default office
location is known
@@ -159,6 +145,21 @@ static char* platformSpecific()
}
return path;
#else
+ const int SEPARATOR = '/';
+ const char* PATHSEPARATOR = ":";
+ const char* PATHVARNAME = "PATH";
+ const char* APPENDIX = "/soffice";
+
+ char* env = NULL;
+ char* str = NULL;
+ char* dir = NULL;
+ char* file = NULL;
+ char* resolved = NULL;
+ char* sep = NULL;
+
+ char buffer[PATH_MAX];
+ int pos;
+
/* get the value of the PATH environment variable */
env = getenv( PATHVARNAME );
str = (char*) malloc( strlen( env ) + 1 );
