restore this, was unused due to incorrect merge

2 files changed, 118 insertions, 109 deletions

diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 4772d7670c..3d0e9c9d30 100644
--- a/linguistic/inc/linguistic/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
@@ -181,23 +181,23 @@ public:
 
 class LNG_DLLPUBLIC PropertyHelper_Thesaurus
 {
-	PropertyHelper_Thes* pInst;
+    PropertyHelper_Thes* pInst;
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >    xPropHelper;
-	
-	// disallow use of copy-constructor and assignment-operator
-	PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
-	PropertyHelper_Thesaurus & operator = ( const PropertyHelper_Thes & );
+
+    // disallow use of copy-constructor and assignment-operator
+    PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
+    PropertyHelper_Thesaurus & operator = ( const PropertyHelper_Thes & );
 
 public:
-	PropertyHelper_Thesaurus(
-			const ::com::sun::star::uno::Reference<
-				::com::sun::star::uno::XInterface > &rxSource,
-			::com::sun::star::uno::Reference<
-				::com::sun::star::beans::XPropertySet > &rxPropSet );
-	~PropertyHelper_Thesaurus();
-	void 	AddAsPropListener();
-	void	RemoveAsPropListener();
-	void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    PropertyHelper_Thesaurus(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet );
+    ~PropertyHelper_Thesaurus();
+    void    AddAsPropListener();
+    void    RemoveAsPropListener();
+    void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
 };
 
 
@@ -253,33 +253,35 @@ public:
 
 class LNG_DLLPUBLIC PropertyHelper_Spelling
 {
-	PropertyHelper_Spell* pInst;
+    PropertyHelper_Spell* pInst;
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >    xPropHelper;
 
-	// disallow use of copy-constructor and assignment-operator
-	PropertyHelper_Spelling( const PropertyHelper_Spell & );
-	PropertyHelper_Spelling & operator = ( const PropertyHelper_Spell & );
+    // disallow use of copy-constructor and assignment-operator
+    PropertyHelper_Spelling( const PropertyHelper_Spell & );
+    PropertyHelper_Spelling & operator = ( const PropertyHelper_Spell & );
 
 public:
-	PropertyHelper_Spelling(
-			const ::com::sun::star::uno::Reference<
-				::com::sun::star::uno::XInterface > &rxSource,
-			::com::sun::star::uno::Reference<
-				::com::sun::star::beans::XPropertySet > &rxPropSet );
-
-	void 	AddAsPropListener();
-	void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
-	sal_Bool	IsSpellUpperCase() const;
-	sal_Bool	IsSpellWithDigits() const;
-	sal_Bool	IsSpellCapitalization() const;
+    PropertyHelper_Spelling(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet );
+    ~PropertyHelper_Spelling();
+
+    void    AddAsPropListener();
+    void    RemoveAsPropListener();
+    void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    sal_Bool    IsSpellUpperCase() const;
+    sal_Bool    IsSpellWithDigits() const;
+    sal_Bool    IsSpellCapitalization() const;
     sal_Bool addLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException);
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException);
     sal_Bool removeLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException);
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException);
 };
 
 
@@ -329,35 +331,35 @@ public:
 
 class LNG_DLLPUBLIC PropertyHelper_Hyphenation
 {
-	PropertyHelper_Hyphen* pInst;
+    PropertyHelper_Hyphen* pInst;
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >    xPropHelper;
-	
-	// disallow use of copy-constructor and assignment-operator
+
+    // disallow use of copy-constructor and assignment-operator
     PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & );
     PropertyHelper_Hyphenation & operator = ( const PropertyHelper_Hyphen & );
 
 public:
     PropertyHelper_Hyphenation(
-			const ::com::sun::star::uno::Reference<
-				::com::sun::star::uno::XInterface > &rxSource,
-			::com::sun::star::uno::Reference<
-				::com::sun::star::beans::XPropertySet > &rxPropSet);
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet);
     ~PropertyHelper_Hyphenation();
 
-	void 	AddAsPropListener();
-	void	RemoveAsPropListener();
-	void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
-	sal_Int16	GetMinLeading() const;
-	sal_Int16	GetMinTrailing() const;
-	sal_Int16	GetMinWordLength() const;
+    void    AddAsPropListener();
+    void    RemoveAsPropListener();
+    void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    sal_Int16   GetMinLeading() const;
+    sal_Int16   GetMinTrailing() const;
+    sal_Int16   GetMinWordLength() const;
     sal_Bool addLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException);
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException);
     sal_Bool removeLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException);
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException);
 };
 
 }   // namespace linguistic
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 7000c2307e..4cf5009208 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -708,147 +708,154 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals )
 }
 
 PropertyHelper_Thesaurus::PropertyHelper_Thesaurus(
-			const ::com::sun::star::uno::Reference<
-				::com::sun::star::uno::XInterface > &rxSource,
-			::com::sun::star::uno::Reference<
-				::com::sun::star::beans::XPropertySet > &rxPropSet )
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet )
 {
-	pInst = new PropertyHelper_Thes( rxSource, rxPropSet );
-	xPropHelper = pInst;
+    pInst = new PropertyHelper_Thes( rxSource, rxPropSet );
+    xPropHelper = pInst;
 }
 
 PropertyHelper_Thesaurus::~PropertyHelper_Thesaurus()
 {
 }
-	
+
 void PropertyHelper_Thesaurus::AddAsPropListener()
 {
-	pInst->AddAsPropListener();
+    pInst->AddAsPropListener();
 }
-	
+
 void PropertyHelper_Thesaurus::RemoveAsPropListener()
 {
-	pInst->RemoveAsPropListener();
+    pInst->RemoveAsPropListener();
 }
 
 void PropertyHelper_Thesaurus::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
 {
-	pInst->SetTmpPropVals( rPropVals );
+    pInst->SetTmpPropVals( rPropVals );
 }
 
 PropertyHelper_Hyphenation::PropertyHelper_Hyphenation(
-			const ::com::sun::star::uno::Reference<
-				::com::sun::star::uno::XInterface > &rxSource,
-			::com::sun::star::uno::Reference<
-				::com::sun::star::beans::XPropertySet > &rxPropSet)
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet)
 {
-	pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet );
-	xPropHelper = pInst;
+    pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet );
+    xPropHelper = pInst;
 }
-				
+
 PropertyHelper_Hyphenation::~PropertyHelper_Hyphenation()
 {
 }
 
 void PropertyHelper_Hyphenation::AddAsPropListener()
 {
-	pInst->AddAsPropListener();
+    pInst->AddAsPropListener();
 }
 
 void PropertyHelper_Hyphenation::RemoveAsPropListener()
 {
-	pInst->RemoveAsPropListener();
+    pInst->RemoveAsPropListener();
 }
 
 void PropertyHelper_Hyphenation::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
 {
-	pInst->SetTmpPropVals( rPropVals );
+    pInst->SetTmpPropVals( rPropVals );
 }
 
 sal_Int16 PropertyHelper_Hyphenation::GetMinLeading() const
 {
-	return pInst->GetMinLeading();
+    return pInst->GetMinLeading();
 }
 
 sal_Int16 PropertyHelper_Hyphenation::GetMinTrailing() const
 {
-	return pInst->GetMinTrailing();
+    return pInst->GetMinTrailing();
 }
 
 sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const
 {
-	return pInst->GetMinWordLength();
+    return pInst->GetMinWordLength();
 }
 
 sal_Bool PropertyHelper_Hyphenation::addLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException)
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException)
 {
-	return pInst->addLinguServiceEventListener( rxListener );
+    return pInst->addLinguServiceEventListener( rxListener );
 }
-			
+
 sal_Bool PropertyHelper_Hyphenation::removeLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException)
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException)
 {
-	return pInst->removeLinguServiceEventListener( rxListener );
+    return pInst->removeLinguServiceEventListener( rxListener );
 }
 
 PropertyHelper_Spelling::PropertyHelper_Spelling(
-			const ::com::sun::star::uno::Reference<
-				::com::sun::star::uno::XInterface > &rxSource,
-			::com::sun::star::uno::Reference<
-				::com::sun::star::beans::XPropertySet > &rxPropSet )
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet )
+{
+    pInst = new PropertyHelper_Spell( rxSource, rxPropSet );
+    xPropHelper = pInst;
+}
+
+PropertyHelper_Spelling::~PropertyHelper_Spelling()
 {
-	pInst = new PropertyHelper_Spell( rxSource, rxPropSet );
-	xPropHelper = pInst;
 }
 
 void PropertyHelper_Spelling::AddAsPropListener()
 {
-	pInst->AddAsPropListener();
+    pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Spelling::RemoveAsPropListener()
+{
+    pInst->RemoveAsPropListener();
 }
 
 void PropertyHelper_Spelling::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
 {
-	pInst->SetTmpPropVals( rPropVals );
+    pInst->SetTmpPropVals( rPropVals );
 }
 
 sal_Bool PropertyHelper_Spelling::IsSpellUpperCase() const
 {
-	return pInst->IsSpellUpperCase();
+    return pInst->IsSpellUpperCase();
 }
 
 sal_Bool PropertyHelper_Spelling::IsSpellWithDigits() const
 {
-	return pInst->IsSpellWithDigits();
+    return pInst->IsSpellWithDigits();
 }
 
 sal_Bool PropertyHelper_Spelling::IsSpellCapitalization() const
 {
-	return pInst->IsSpellCapitalization();
+    return pInst->IsSpellCapitalization();
 }
 
 sal_Bool PropertyHelper_Spelling::addLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException)
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException)
 {
-	return pInst->addLinguServiceEventListener( rxListener );
+    return pInst->addLinguServiceEventListener( rxListener );
 }
-			
+
 sal_Bool PropertyHelper_Spelling::removeLinguServiceEventListener(
-				const ::com::sun::star::uno::Reference<
-					::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-			throw(::com::sun::star::uno::RuntimeException)
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(::com::sun::star::uno::RuntimeException)
 {
-	return pInst->removeLinguServiceEventListener( rxListener );
+    return pInst->removeLinguServiceEventListener( rxListener );
 }
 
-		
-
 }   // namespace linguistic
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */