1 files changed, 10 insertions, 10 deletions

diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 4e114b53954d..823a088ba3d3 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -138,7 +138,7 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl()
 
 void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* pNewTokens, const String* pNewContent,
                                     const ScAddress* pNewPos, const sal_uInt16* pNewType,
-                                    const ScGrammar::Grammar eGrammar )
+                                    const formula::FormulaGrammar::Grammar eGrammar )
 {
     if (pDocShell)
     {
@@ -206,7 +206,7 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName )
 
     String aNewStr(aNewName);
     // GRAM_PODF_A1 for API compatibility.
-    Modify_Impl( &aNewStr, NULL, NULL, NULL, NULL, ScGrammar::GRAM_PODF_A1 );
+    Modify_Impl( &aNewStr, NULL, NULL, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
 
     if ( aName != aNewStr )                 // some error occured...
         throw uno::RuntimeException();      // no other exceptions specified
@@ -219,7 +219,7 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException
     ScRangeData* pData = GetRangeData_Impl();
     if (pData)
         // GRAM_PODF_A1 for API compatibility.
-        pData->GetSymbol( aContent, ScGrammar::GRAM_PODF_A1);
+        pData->GetSymbol( aContent,formula::FormulaGrammar::GRAM_PODF_A1);
     return aContent;
 }
 
@@ -229,11 +229,11 @@ void SAL_CALL ScNamedRangeObj::setContent( const rtl::OUString& aContent )
     ScUnoGuard aGuard;
     String aContStr(aContent);
     // GRAM_PODF_A1 for API compatibility.
-    Modify_Impl( NULL, NULL, &aContStr, NULL, NULL, ScGrammar::GRAM_PODF_A1 );
+    Modify_Impl( NULL, NULL, &aContStr, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
 }
 
 void ScNamedRangeObj::SetContentWithGrammar( const ::rtl::OUString& aContent,
-                                    const ScGrammar::Grammar eGrammar )
+                                    const formula::FormulaGrammar::Grammar eGrammar )
                                 throw(::com::sun::star::uno::RuntimeException)
 {
     String aContStr(aContent);
@@ -272,7 +272,7 @@ void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& a
     ScUnoGuard aGuard;
     ScAddress aPos( (SCCOL)aReferencePosition.Column, (SCROW)aReferencePosition.Row, aReferencePosition.Sheet );
     // GRAM_PODF_A1 for API compatibility.
-    Modify_Impl( NULL, NULL, NULL, &aPos, NULL, ScGrammar::GRAM_PODF_A1 );
+    Modify_Impl( NULL, NULL, NULL, &aPos, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
 }
 
 sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException)
@@ -303,7 +303,7 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) throw(uno::RuntimeE
     if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER )         nNewType |= RT_ROWHEADER;
 
     // GRAM_PODF_A1 for API compatibility.
-    Modify_Impl( NULL, NULL, NULL, NULL, &nNewType, ScGrammar::GRAM_PODF_A1 );
+    Modify_Impl( NULL, NULL, NULL, NULL, &nNewType,formula::FormulaGrammar::GRAM_PODF_A1 );
 }
 
 // XFormulaTokens
@@ -330,7 +330,7 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke
         ScTokenArray aTokenArray;
         (void)ScTokenConversion::ConvertToTokenArray( *pDocShell->GetDocument(), aTokenArray, rTokens );
         // GRAM_PODF_A1 for API compatibility.
-        Modify_Impl( NULL, &aTokenArray, NULL, NULL, NULL, ScGrammar::GRAM_PODF_A1 );
+        Modify_Impl( NULL, &aTokenArray, NULL, NULL, NULL, formula::FormulaGrammar::GRAM_PODF_A1 );
     }
 }
 
@@ -378,7 +378,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue(
         if( aValue >>= bIsShared )
         {
             sal_uInt16 nNewType = bIsShared ? RT_SHARED : RT_NAME;
-            Modify_Impl( NULL, NULL, NULL, NULL, &nNewType, ScGrammar::GRAM_PODF_A1 );
+            Modify_Impl( NULL, NULL, NULL, NULL, &nNewType,formula::FormulaGrammar::GRAM_PODF_A1 );
         }
     }
 }
@@ -562,7 +562,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
             ScRangeName* pNewRanges = new ScRangeName( *pNames );
             // GRAM_PODF_A1 for API compatibility.
             ScRangeData* pNew = new ScRangeData( pDoc, aNameStr, aContStr,
-                                                aPos, nNewType, ScGrammar::GRAM_PODF_A1 );
+                                                aPos, nNewType,formula::FormulaGrammar::GRAM_PODF_A1 );
             if ( pNewRanges->Insert(pNew) )
             {
                 ScDocFunc aFunc(*pDocShell);