[Libreoffice-commits] core.git: connectivity/source dbaccess/source framework/source include/comphelper include/editeng include/registry include/svx sc/source starmath/source svx/source UnoControls/source vcl/inc xmlsecurity/test_docs
Takeshi Abe
tabe at fixedpoint.jp
Wed Jan 25 06:06:27 UTC 2017
UnoControls/source/controls/progressmonitor.cxx | 4 ++--
connectivity/source/inc/TSkipDeletedSet.hxx | 2 +-
dbaccess/source/ui/misc/HtmlReader.cxx | 2 +-
framework/source/helper/dockingareadefaultacceptor.cxx | 4 ++--
framework/source/layoutmanager/layoutmanager.cxx | 4 ++--
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2 +-
framework/source/services/frame.cxx | 2 +-
framework/source/tabwin/tabwindow.cxx | 2 +-
include/comphelper/configurationhelper.hxx | 12 ++++++------
include/editeng/unoedsrc.hxx | 2 +-
include/registry/registry.hxx | 8 ++++----
include/svx/svdglev.hxx | 2 +-
include/svx/svdglue.hxx | 2 +-
sc/source/core/tool/consoli.cxx | 2 +-
sc/source/filter/inc/scflt.hxx | 2 +-
starmath/source/accessibility.cxx | 6 +++---
starmath/source/view.cxx | 2 +-
svx/source/svdraw/svdomeas.cxx | 4 ++--
svx/source/unodraw/unoshape.cxx | 4 ++--
vcl/inc/win/saldata.hxx | 2 +-
xmlsecurity/test_docs/tools/README.txt | 2 +-
21 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 6d898945d57b53b862c41a3adbd0d4eddd8dfbcd
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jan 24 12:56:13 2017 +0900
Fix typo in comments: relativ -> relative
Change-Id: I58833e503e93b8057f92710c5828bba6cecd4e09
Reviewed-on: https://gerrit.libreoffice.org/33488
Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>
Tested-by: Takeshi Abe <tabe at fixedpoint.jp>
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 1cb5695..79bc853 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -638,7 +638,7 @@ void ProgressMonitor::impl_recalcLayout ()
nWidth_Topic_Top = std::max( aTopicSize_Top.Width, aTopicSize_Bottom.Width );
nHeight_Topic_Top = aTopicSize_Top.Height;
- // Right column before progressbar has relativ position to left column ...
+ // Right column before progressbar has relative position to left column ...
// ... and a size as rest of dialog size!
nX_Text_Top = nX_Topic_Top+nWidth_Topic_Top+PROGRESSMONITOR_FREEBORDER;
nY_Text_Top = nY_Topic_Top;
@@ -652,7 +652,7 @@ void ProgressMonitor::impl_recalcLayout ()
nWidth_Text_Top = impl_getWidth()-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER);
nHeight_Text_Top = nHeight_Topic_Top;
- // Position of progressbar is relativ to columns before.
+ // Position of progressbar is relative to columns before.
// Progressbar.Width = Dialog.Width !!!
// Progressbar.Height = Button.Height
nX_ProgressBar = nX_Topic_Top;
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 09f8652..4b61008 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -55,7 +55,7 @@ namespace connectivity
it guarantees that the row isn't deleted
@param
IResultSetHelper::Movement _eCursorPosition in which direction the resultset should be moved
- sal_Int32 _nOffset the position relativ to the movement
+ sal_Int32 _nOffset the position relative to the movement
sal_Bool _bRetrieveData is true when the current row should be filled which data
@return
true when the movement was successful otherwise false
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index ade33d9..a2aaf9d 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -390,7 +390,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
else
{
if ( rOptVal.indexOf('*') != -1 )
- { // relativ to what?!?
+ { // relative to what?!?
//TODO: collect ColArray of all relevant values and then MakeCol
return 0;
}
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index f8fef01..eef64d2 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -73,7 +73,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
if ( xContainerWindow.is() && xComponentWindow.is() )
{
css::uno::Reference< css::awt::XDevice > xDevice( xContainerWindow, css::uno::UNO_QUERY );
- // Convert relativ size to output size.
+ // Convert relative size to output size.
css::awt::Rectangle aRectangle = xContainerWindow->getPosSize();
css::awt::DeviceInfo aInfo = xDevice->getInfo();
css::awt::Size aSize ( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset ,
@@ -107,7 +107,7 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R
if ( xContainerWindow.is() && xComponentWindow.is() )
{
css::uno::Reference< css::awt::XDevice > xDevice( xContainerWindow, css::uno::UNO_QUERY );
- // Convert relativ size to output size.
+ // Convert relative size to output size.
css::awt::Rectangle aRectangle = xContainerWindow->getPosSize();
css::awt::DeviceInfo aInfo = xDevice->getInfo();
css::awt::Size aSize ( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset ,
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index cd21f4e..606b06d 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2525,7 +2525,7 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rB
aReadLock.clear();
uno::Reference< awt::XDevice > xDevice( xContainerWindow, uno::UNO_QUERY );
- // Convert relativ size to output size.
+ // Convert relative size to output size.
awt::Rectangle aRectangle = xContainerWindow->getPosSize();
awt::DeviceInfo aInfo = xDevice->getInfo();
awt::Size aContainerClientSize = awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset,
@@ -2682,7 +2682,7 @@ throw( uno::RuntimeException, std::exception )
{
uno::Reference< awt::XDevice > xDevice( m_xFrame->getContainerWindow(), uno::UNO_QUERY );
- // Convert relativ size to output size.
+ // Convert relative size to output size.
awt::Rectangle aRectangle = m_xFrame->getContainerWindow()->getPosSize();
awt::DeviceInfo aInfo = xDevice->getInfo();
awt::Size aSize( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset ,
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 38a36046..6b01140 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -150,7 +150,7 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl
uno::Reference< awt::XDevice > xDevice( xContainerWindow, uno::UNO_QUERY );
- // Convert relativ size to output size.
+ // Convert relative size to output size.
awt::Rectangle aRectangle = xContainerWindow->getPosSize();
awt::DeviceInfo aInfo = xDevice->getInfo();
awt::Size aContainerClientSize = awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset ,
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 9d66a172..cb6994a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3134,7 +3134,7 @@ void Frame::implts_resizeComponentWindow()
{
css::uno::Reference< css::awt::XDevice > xDevice( getContainerWindow(), css::uno::UNO_QUERY );
- // Convert relativ size to output size.
+ // Convert relative size to output size.
css::awt::Rectangle aRectangle = getContainerWindow()->getPosSize();
css::awt::DeviceInfo aInfo = xDevice->getInfo();
css::awt::Size aSize( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset,
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index be924db..f92628f 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -112,7 +112,7 @@ void TabWindow::implts_LayoutWindows() const
aLock.clear();
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- // Convert relativ size to output size.
+ // Convert relative size to output size.
if ( xWindow.is() && xDevice.is() )
{
css::awt::Rectangle aRectangle = xWindow->getPosSize();
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index 4a9243a..916ee01 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -101,11 +101,11 @@ public:
*
* This method must be used in combination with openConfig().
* The cached configuration access must be provided here ... and
- * all operations are made relativ to this access point.
+ * all operations are made relative to this access point.
*
* @param xCFG
* the configuration root, where sRelPath should be interpreted.
- * as relativ path
+ * as relative path
*
* @param sRelPath
* path relative to xCFG parameter.
@@ -130,11 +130,11 @@ public:
*
* This method must be used in combination with openConfig().
* The cached configuration access must be provided here ... and
- * all operations are made relativ to this access point.
+ * all operations are made relative to this access point.
*
* @param xCFG
* the configuration root, where sRelPath should be interpreted.
- * as relativ path
+ * as relative path
*
* @param sRelPath
* path relative to xCFG parameter.
@@ -161,14 +161,14 @@ public:
*
* This method must be used in combination with openConfig().
* The cached configuration access must be provided here ... and
- * all operations are made relativ to this access point.
+ * all operations are made relative to this access point.
*
* Further this method must be used only with configuration set's.
* Atomic keys can't be "created" ... they "exists every time".
*
* @param xCFG
* the configuration root, where sRelPathToSet should be interpreted
- * as relativ path.
+ * as relative path.
*
* @param sRelPathToSet
* path relative to xCFG parameter.
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 7c84c7c..e493081 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -270,7 +270,7 @@ public:
@param rPoint
Point to query text position of. Is interpreted in logical
- coordinates, relativ to the upper left corner of the text, and
+ coordinates, relative to the upper left corner of the text, and
in the map mode given by GetMapMode()
@param rPara[0 .. n-1]
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 0aea6fd..230e029 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -371,7 +371,7 @@ public:
/** creates a new key or opens a key if the specified key already exists.
- The specified keyname is relativ to this key.
+ The specified keyname is relative to this key.
@param keyName specifies the name of the key which will be opened or created.
@param rNewKey references a RegistryKey which will be filled with the new or open key.
@return RegError::NO_ERROR if succeeds else an error code.
@@ -381,7 +381,7 @@ public:
/** opens the specified key.
- The specified keyname is relativ to this key.
+ The specified keyname is relative to this key.
@param keyName specifies the name of the key which will be opened.
@param rOpenKey references a RegistryKey which will be filled with the open key.
@return RegError::NO_ERROR if succeeds else an error code.
@@ -391,7 +391,7 @@ public:
/** opens all subkeys of the specified key.
- The specified keyname is relativ to this key.
+ The specified keyname is relative to this key.
@param keyName specifies the name of the key which subkeys will be opened.
@param rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
@return RegError::NO_ERROR if succeeds else an error code.
@@ -401,7 +401,7 @@ public:
/** returns an array with the names of all subkeys of the specified key.
- The specified keyname is relativ to this key.
+ The specified keyname is relative to this key.
@param keyName specifies the name of the key which subkey names will be returned.
@param rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
@return RegError::NO_ERROR if succeeds else an error code.
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 50beed4..d085464 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -51,7 +51,7 @@ public:
SDR_TRISTATE IsMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc) const;
void SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, bool bOn);
- // check/set, if the GluePoints are relativ to the
+ // check/set, if the GluePoints are relative to the
// object size (Percent=sal_True) or not (Percent=sal_False)
SDR_TRISTATE IsMarkedGluePointsPercent() const;
void SetMarkedGluePointsPercent(bool bOn);
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 1543e0e..3e4e8c8 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -67,7 +67,7 @@ namespace o3tl
class SVX_DLLPUBLIC SdrGluePoint {
// Reference Point is SdrObject::GetSnapRect().Center()
// bNoPercent=false: position is -5000..5000 (1/100)% or 0..10000 (depending on align)
- // bNoPercent=true : position is in log unit, relativ to the reference point
+ // bNoPercent=true : position is in log unit, relative to the reference point
Point aPos;
SdrEscapeDirection nEscDir;
sal_uInt16 nId;
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 6780153..76e5904 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -680,7 +680,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
}
}
- // insert sum (relativ, not 3d)
+ // insert sum (relative, not 3d)
ScAddress aDest( sal::static_int_cast<SCCOL>(nCol+nArrX),
sal::static_int_cast<SCROW>(nRow+nArrY+nNeeded), nTab );
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index aa13a38..6f6cebb 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -482,7 +482,7 @@ struct Sc10GraphHeader
sal_Int32 y;
sal_Int32 w; // w,h width and height in pixels
sal_Int32 h;
- sal_uInt8 IsRelPos; // position relativ to cell, or absolute in the table
+ sal_uInt8 IsRelPos; // position relative to cell, or absolute in the table
sal_uInt8 DoPrint; // print Grafic?
sal_uInt16 FrameType; // Frame type around Grafic (none, simple, double, simple thick, double thick)
sal_uInt8 IsTransparent; // show background?
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 792d304..8bce953 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -70,7 +70,7 @@ static awt::Rectangle lcl_GetBounds( vcl::Window *pWin )
{
// !! see VCLXAccessibleComponent::implGetBounds()
- //! the coordinates returned are relativ to the parent window !
+ //! the coordinates returned are relative to the parent window !
//! Thus the top-left point may be different from (0, 0) !
awt::Rectangle aBounds;
@@ -172,7 +172,7 @@ uno::Reference< XAccessibleContext > SAL_CALL SmGraphicAccessible::getAccessible
sal_Bool SAL_CALL SmGraphicAccessible::containsPoint( const awt::Point& aPoint )
throw (RuntimeException, std::exception)
{
- //! the arguments coordinates are relativ to the current window !
+ //! the arguments coordinates are relative to the current window !
//! Thus the top-left point is (0, 0)
SolarMutexGuard aGuard;
@@ -1645,7 +1645,7 @@ uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleCon
sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint )
throw (RuntimeException, std::exception)
{
- //! the arguments coordinates are relativ to the current window !
+ //! the arguments coordinates are relative to the current window !
//! Thus the top left-point is (0, 0)
SolarMutexGuard aGuard;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 36c7dfd..dc099f9 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -158,7 +158,7 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt)
SAL_WARN_IF( rMEvt.GetClicks() == 0, "starmath", "0 clicks" );
if ( rMEvt.IsLeft() )
{
- // get click position relativ to formula
+ // get click position relative to formula
Point aPos (PixelToLogic(rMEvt.GetPosPixel())
- GetFormulaDrawPos());
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 286e608..b6d5a4f 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -390,11 +390,11 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
nArrow1Wdt = static_cast<const XLineStartWidthItem&>(rSet.Get(XATTR_LINESTARTWIDTH)).GetValue();
if(nArrow1Wdt < 0)
- nArrow1Wdt = -nLineWdt * nArrow1Wdt / 100; // <0 = relativ
+ nArrow1Wdt = -nLineWdt * nArrow1Wdt / 100; // <0 = relative
nArrow2Wdt = static_cast<const XLineEndWidthItem&>(rSet.Get(XATTR_LINEENDWIDTH)).GetValue();
if(nArrow2Wdt < 0)
- nArrow2Wdt = -nLineWdt * nArrow2Wdt / 100; // <0 = relativ
+ nArrow2Wdt = -nLineWdt * nArrow2Wdt / 100; // <0 = relative
basegfx::B2DPolyPolygon aPol1(static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue());
basegfx::B2DPolyPolygon aPol2(static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue());
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index d736718..bf54674 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1122,7 +1122,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::ex
Rectangle aRect( svx_getLogicRectHack(mpObj.get()) );
Point aPt( aRect.Left(), aRect.Top() );
- // Position is relativ to anchor, so recalc to absolute position
+ // Position is relative to anchor, so recalc to absolute position
if( mpModel->IsWriter() )
aPt -= mpObj->GetAnchorPos();
@@ -1150,7 +1150,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
Point aLocalPos( Position.X, Position.Y );
ForceMetricToItemPoolMetric(aLocalPos);
- // Position is absolute, so recalc to position relativ to anchor
+ // Position is absolute, so recalc to position relative to anchor
if( mpModel->IsWriter() )
aLocalPos += mpObj->GetAnchorPos();
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index fc82e13..2fb1b49 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -228,7 +228,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
// wParam == 0; lParam == pData
#define SAL_MSG_USEREVENT (WM_USER+130)
-// wParam == 0; lParam == MousePosition relativ to upper left of screen
+// wParam == 0; lParam == MousePosition relative to upper left of screen
#define SAL_MSG_MOUSELEAVE (WM_USER+131)
// NULL-Message, should not be processed
#define SAL_MSG_DUMMY (WM_USER+132)
diff --git a/xmlsecurity/test_docs/tools/README.txt b/xmlsecurity/test_docs/tools/README.txt
index 159d2c0..b253a78 100644
--- a/xmlsecurity/test_docs/tools/README.txt
+++ b/xmlsecurity/test_docs/tools/README.txt
@@ -10,7 +10,7 @@ java -jar httpserv/dist/httpserv.jar --accept portnumber
portnumber: an arbitrary port number to which the server should listen.
-httpserv looks for the requested file relativ to the current directory. For
+httpserv looks for the requested file relative to the current directory. For
example, you are in
$(SRC_ROOT)/xmlsecurity/$(INPATH)/httpserv/dist/javadoc,
a directory which contains the index.html. From there you run httpserv.jar:
More information about the Libreoffice-commits
mailing list