1 files changed, 5 insertions, 9 deletions

diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index b022b22cc9e8..b82b82bb1288 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -143,7 +143,7 @@ namespace svxform
             m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
         );
 
-        SetDragDropMode(0xFFFF);
+        SetDragDropMode(DragDropMode::ALL);
         EnableInplaceEditing( true );
         SetSelectionMode(MULTIPLE_SELECTION);
 
@@ -1266,7 +1266,7 @@ namespace svxform
                 if ( pEntry )
                 {
                     m_aCutEntries.insert( pEntry );
-                    pEntry->SetFlags( pEntry->GetFlags() | SV_ENTRYFLAG_SEMITRANSPARENT );
+                    pEntry->SetFlags( pEntry->GetFlags() | SvTLEntryFlags::SEMITRANSPARENT );
                     InvalidateEntry( pEntry );
                 }
             }
@@ -1404,11 +1404,7 @@ namespace svxform
 
 
         // set name
-        FmFormView*     pFormView       = GetNavModel()->GetFormShell()->GetFormView();
-        SdrPageView*    pPageView       = pFormView->GetSdrPageView();
-        FmFormPage*     pPage           = static_cast<FmFormPage*>(pPageView->GetPage());
-
-        OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm );
+        OUString sName = FmFormPageImpl::setUniqueName( xNewComponent, xParentForm );
 
         pNewFormControlData->SetText( sName );
 
@@ -1471,7 +1467,7 @@ namespace svxform
 
         GrabFocus();
         FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData());
-        bool bRes = GetNavModel()->Rename( pEntryData, rNewText);
+        bool bRes = NavigatorTreeModel::Rename( pEntryData, rNewText);
         if( !bRes )
         {
             m_pEditEntry = pEntry;
@@ -1570,7 +1566,7 @@ namespace svxform
                     if ( !pEntry )
                         continue;
 
-                    pEntry->SetFlags( pEntry->GetFlags() & ~SV_ENTRYFLAG_SEMITRANSPARENT );
+                    pEntry->SetFlags( pEntry->GetFlags() & ~SvTLEntryFlags::SEMITRANSPARENT );
                     InvalidateEntry( pEntry );
                 }
                 ListBoxEntrySet aEmpty;