sw/source/ui/vba/vbabookmark.cxx | 8 ++++----
sw/source/ui/vba/vbabookmark.hxx | 2 +-
sw/source/ui/vba/vbavariable.cxx | 12 ++++++------
sw/source/ui/vba/vbavariable.hxx | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit ca8560e006b014886bd6210d4e5b236cf7badcd0
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Sun Dec 27 01:48:46 2015 +1100
sw: (vba) change instances of maName to more descriptive names
Change-Id: Icb20fa909681ccb6acfc72f4243c09e9b9b4a3c2
Reviewed-on: https://gerrit.libreoffice.org/20957
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
Tested-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index 1cf332c..1789193 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -32,11 +32,11 @@ using namespace ::ooo::vba;
using namespace ::com::sun::star;
SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface
>& rParent, const uno::Reference< uno::XComponentContext >& rContext,
- const css::uno::Reference< frame::XModel >& rModel, const OUString& rName
) throw ( css::uno::RuntimeException ) :
- SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName
), mbValid( true )
+ const css::uno::Reference< frame::XModel >& rModel, const OUString&
rBookmarkName ) throw ( css::uno::RuntimeException ) :
+ SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ),
maBookmarkName( rBookmarkName ), mbValid( true )
{
uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel,
uno::UNO_QUERY_THROW );
- mxBookmark.set( xBookmarksSupplier->getBookmarks()->getByName( maName ),
uno::UNO_QUERY_THROW );
+ mxBookmark.set( xBookmarksSupplier->getBookmarks()->getByName(
maBookmarkName ), uno::UNO_QUERY_THROW );
}
SwVbaBookmark::~SwVbaBookmark()
@@ -66,7 +66,7 @@ void SAL_CALL SwVbaBookmark::Select() throw (
uno::RuntimeException, std::except
OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException,
std::exception )
{
- return maName;
+ return maBookmarkName;
}
void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) throw (
uno::RuntimeException, std::exception )
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index 2df51ac..2b28f7b 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -31,7 +31,7 @@ class SwVbaBookmark : public SwVbaBookmark_BASE
private:
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::text::XTextContent > mxBookmark;
- OUString maName;
+ OUString maBookmarkName;
bool mbValid;
private:
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index dbecbba..7aab993 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -26,8 +26,8 @@ using namespace ::ooo::vba;
using namespace ::com::sun::star;
SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface
>& rParent, const uno::Reference< uno::XComponentContext >& rContext,
- const uno::Reference< beans::XPropertyAccess >& rUserDefined, const
OUString& rName ) throw ( uno::RuntimeException ) :
- SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ),
maName( rName )
+ const uno::Reference< beans::XPropertyAccess >& rUserDefined, const
OUString& rVariableName ) throw ( uno::RuntimeException ) :
+ SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ),
maVariableName( rVariableName )
{
}
@@ -38,7 +38,7 @@ SwVbaVariable::~SwVbaVariable()
OUString SAL_CALL
SwVbaVariable::getName() throw ( css::uno::RuntimeException, std::exception )
{
- return maName;
+ return maVariableName;
}
void SAL_CALL
@@ -51,7 +51,7 @@ uno::Any SAL_CALL
SwVbaVariable::getValue() throw ( css::uno::RuntimeException, std::exception )
{
uno::Reference< beans::XPropertySet > xProp( mxUserDefined,
uno::UNO_QUERY_THROW );
- return xProp->getPropertyValue( maName );
+ return xProp->getPropertyValue( maVariableName );
}
void SAL_CALL
@@ -59,7 +59,7 @@ SwVbaVariable::setValue( const uno::Any& rValue ) throw (
css::uno::RuntimeExcep
{
// FIXME: fail to set the value if the new type of value is different from
the original one.
uno::Reference< beans::XPropertySet > xProp( mxUserDefined,
uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( maName, rValue );
+ xProp->setPropertyValue( maVariableName, rValue );
}
sal_Int32 SAL_CALL
@@ -68,7 +68,7 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException,
std::exception )
const uno::Sequence< beans::PropertyValue > props =
mxUserDefined->getPropertyValues();
for (sal_Int32 i = 0; i < props.getLength(); ++i)
{
- if( maName.equals( props[i].Name ) )
+ if( maVariableName.equals( props[i].Name ) )
return i+1;
}
diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx
index 7c4fade..19b4db1 100644
--- a/sw/source/ui/vba/vbavariable.hxx
+++ b/sw/source/ui/vba/vbavariable.hxx
@@ -29,7 +29,7 @@ class SwVbaVariable : public SwVbaVariable_BASE
{
private:
css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
- OUString maName;
+ OUString maVariableName;
public:
SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >&
rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
