PageMarginControl.cxx (2924af3d) | PageMarginControl.cxx (550fbbbd) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 350 unchanged lines hidden (view full) --- 359 { 360 bApplyNewPageMargins = false; 361 } 362 break; 363 } 364 365 if ( bApplyNewPageMargins ) 366 { | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 350 unchanged lines hidden (view full) --- 359 { 360 bApplyNewPageMargins = false; 361 } 362 break; 363 } 364 365 if ( bApplyNewPageMargins ) 366 { |
367 mrPagePropPanel.StartUndo(); |
|
367 mpMarginValueSet->SetNoSelection(); 368 mrPagePropPanel.ExecuteMarginLRChange( mnPageLeftMargin, mnPageRightMargin ); 369 mrPagePropPanel.ExecuteMarginULChange( mnPageTopMargin, mnPageBottomMargin ); 370 if ( mbMirrored != bMirrored ) 371 { 372 mbMirrored = bMirrored; 373 mrPagePropPanel.ExecutePageLayoutChange( mbMirrored ); 374 } | 368 mpMarginValueSet->SetNoSelection(); 369 mrPagePropPanel.ExecuteMarginLRChange( mnPageLeftMargin, mnPageRightMargin ); 370 mrPagePropPanel.ExecuteMarginULChange( mnPageTopMargin, mnPageBottomMargin ); 371 if ( mbMirrored != bMirrored ) 372 { 373 mbMirrored = bMirrored; 374 mrPagePropPanel.ExecutePageLayoutChange( mbMirrored ); 375 } |
376 mrPagePropPanel.EndUndo(); |
|
375 376 mbCustomValuesUsed = false; 377 mrPagePropPanel.ClosePageMarginPopup(); 378 } 379 else 380 { 381 // back to initial selection 382 SelectValueSetItem(); --- 141 unchanged lines hidden --- | 377 378 mbCustomValuesUsed = false; 379 mrPagePropPanel.ClosePageMarginPopup(); 380 } 381 else 382 { 383 // back to initial selection 384 SelectValueSetItem(); --- 141 unchanged lines hidden --- |